summaryrefslogtreecommitdiffstats
path: root/git-mergetool.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-141-0/+352