Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
correct a typo in README
- Loading branch information
Showing
with
1 addition
and
1 deletion.
-
+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 |
|
|
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session.
You signed out in another tab or window. Reload to refresh your session.