diff options
| author | Michał Gołębiowski <m.goleb@gmail.com> | 2013-08-12 18:31:00 +0200 |
|---|---|---|
| committer | Michał Gołębiowski <m.goleb@gmail.com> | 2013-08-12 18:31:00 +0200 |
| commit | 7627b8b6d9ef6e57dbd20a55b946bd1991c1223e (patch) | |
| tree | 94f1591370a77da65ebdc0e424d512d5c0bce685 /README.md | |
| parent | 012bda75f1941eb60869be1e4b6606aa40b17024 (diff) | |
| download | jquery-7627b8b6d9ef6e57dbd20a55b946bd1991c1223e.tar.gz jquery-7627b8b6d9ef6e57dbd20a55b946bd1991c1223e.zip | |
correct a typo in README
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |