Skip to content
Permalink
Browse files

correct a typo in README

  • Loading branch information...
mgol committed Aug 12, 2013
1 parent 012bda7 commit 7627b8b6d9ef6e57dbd20a55b946bd1991c1223e
Showing with 1 addition and 1 deletion.
  1. +1 −1 README.md
@@ -205,7 +205,7 @@ Following are some commands that can be used there:
* `Ctrl + Alt + M` - automerge as much as possible
* `b` - jump to next merge conflict
* `s` - change the order of the conflicted lines
* `u` - undo an merge
* `u` - undo a merge
* `left mouse button` - mark a block to be the winner
* `middle mouse button` - mark a line to be the winner
* `Ctrl + S` - save

0 comments on commit 7627b8b

Please sign in to comment.
You can’t perform that action at this time.