##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
| Main Talks: | |
| ----------- | |
| Please, no More Minutes, Milliseconds, Monoliths... or Monitoring Tools! | |
| Adrian Cockcroft | |
| http://vimeo.com/95064249 | |
| http://www.slideshare.net/adriancockcroft/monitorama-please-no-more | |
| Computers are a Sadness, I am the Cure | |
| James Mickens | |
| http://vimeo.com/95066828 |
Loosely ordered with the commands I use most towards the top. Sublime also offer full documentation.
| Ctrl+C | copy current line (if no selection) |
| Ctrl+X | cut current line (if no selection) |
| Ctrl+⇧+K | delete line |
| Ctrl+↩ | insert line after |