This tool can be used with git mergetool during a merge operation. This is how can it be used:
- Browse for differences and retain
:diffget x - Choose which version you want to keep with 1, 2 and 3 for the source, base and the target copy
]c - next difference
[c - previous difference- Wrap up the changes
:only - once you’re resolved all conflicts, this shows only the middle/merged file
:wq (save and quit)- split navigations
ctrl-w then j, k, h, l- Vim’s defaults are useful for changing split shapes:
"Max out the height of the current split
ctrl + w _"Max out the width of the current split
ctrl + w |"Normalize all split sizes, which is very handy when resizing terminal
ctrl + w =