summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
AgeCommit message (Expand)AuthorFilesLines
2007-06-10[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolLibravatar Dan McGee1-1/+1
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-05-03Document 'opendiff' value in config.txt and git-mergetool.txtLibravatar Arjen Laarhoven1-1/+1
2007-03-29Fix minor formatting issue in man page for git-mergetoolLibravatar Theodore Ts'o1-5/+5
2007-03-18mergetool: Add support for vimdiff.Libravatar James Bowes1-1/+1
2007-03-13Add git-mergetool to run an appropriate merge conflict resolution programLibravatar Theodore Ts'o1-0/+46