Skip to content

J
jquery
Commit 144837af authored by Michał Gołębiowski's avatar Michał Gołębiowski
Browse files
Options

correct a typo in README

parent 032ef352
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
README.md
View file @ 144837af
...@@ -204,7 +204,7 @@ Following are some commands that can be used there: ...@@ -204,7 +204,7 @@ Following are some commands that can be used there:
* `Ctrl + Alt + M` - automerge as much as possible * `Ctrl + Alt + M` - automerge as much as possible
* `b` - jump to next merge conflict * `b` - jump to next merge conflict
* `s` - change the order of the conflicted lines * `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 * `left mouse button` - mark a block to be the winner
* `middle mouse button` - mark a line to be the winner * `middle mouse button` - mark a line to be the winner
* `Ctrl + S` - save * `Ctrl + S` - save
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment