Posts about mergetool

2020-04-10 09:33Make Emacs faster than Vim in "git mergetool"
2019-11-13 13:29Emacs is the best merge tool for Git
2013-06-10 21:08Use vimdiff to resolve git/subversion/mercurial merge conflicts effectively