library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct a typo in README

Browse Source
This commit is contained in:
Michał Gołębiowski 2013-08-12 18:31:00 +02:00
parent 012bda75f1
commit 7627b8b6d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -205,7 +205,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