Skip to content
This repository has been archived by the owner on Nov 8, 2017. It is now read-only.

Use alt-M instead of ctrl-M in the keymap. #162

Merged
merged 2 commits into from
Jul 16, 2015
Merged

Use alt-M instead of ctrl-M in the keymap. #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91ff0d8
Use alt-M instead of ctrl-M in the keymap.
smashwilson Jul 16, 2015
d6c29b5
Add a changelog entry.
smashwilson Jul 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## 1.3.3

- Use alt-m instead of ctrl-m in key bindings. [#162](https://github.com/smashwilson/merge-conflicts/pull/162)
- Use Atom's built-in notification API. [#151](https://github.com/smashwilson/merge-conflicts/pull/151)

## 1.3.2
Expand Down
14 changes: 7 additions & 7 deletions keymaps/merge-conflicts.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
# https://atom.io/docs/latest/advanced/keymaps

'atom-text-editor.conflicted':
'ctrl-m down': 'merge-conflicts:next-unresolved'
'ctrl-m up': 'merge-conflicts:previous-unresolved'
'ctrl-m enter': 'merge-conflicts:accept-current'
'ctrl-m r': 'merge-conflicts:revert-current'
'ctrl-m 1': 'merge-conflicts:accept-ours'
'ctrl-m 2': 'merge-conflicts:accept-theirs'
'alt-m down': 'merge-conflicts:next-unresolved'
'alt-m up': 'merge-conflicts:previous-unresolved'
'alt-m enter': 'merge-conflicts:accept-current'
'alt-m r': 'merge-conflicts:revert-current'
'alt-m 1': 'merge-conflicts:accept-ours'
'alt-m 2': 'merge-conflicts:accept-theirs'

'atom-workspace':
'ctrl-m d': 'merge-conflicts:detect'
'alt-m d': 'merge-conflicts:detect'