Articles Related
Command
- Ctrl + Alt + M - automerge as much as possible
- b - jump to next merge conflict
- s - change the order of the conflicted lines
- 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
- Ctrl + Q - quit
Documentation / Reference
- Used by Jquery