path: root/Documentation/git-mergetool.txt
AgeCommit message (Expand)Author
2007-06-10[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee
2007-06-07War on whitespaceJunio C Hamano
2007-05-04Document 'opendiff' value in config.txt and git-mergetool.txtArjen Laarhoven
2007-03-29Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o
2007-03-19mergetool: Add support for vimdiff.James Bowes
2007-03-14Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o