4 ms·
i always want to use vimdiff with git mergetool but i’ve never been able to figure out how to use it when i launch the 3way split. i know there are commands to
by BaculumMeumEst 4y ago
i always want to use vimdiff with git mergetool but i’ve never been able to figure out how to use it when i launch the 3way split. i know there are commands to choose between local/base/remote for each conflict i dont know where my cursor is supposed to be or where i should be using those commands from.
i always end up going back to emacs and just using smerge, with its super straightforward “go to next conflict” and “choose upper or lower” commands