summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
AgeCommit message (Expand)AuthorFilesLines
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