Age | Commit message (Expand) | Author |
---|---|---|
2007-05-04 | Document 'opendiff' value in config.txt and git-mergetool.txt | Arjen Laarhoven |
2007-03-29 | Fix minor formatting issue in man page for git-mergetool | Theodore Ts'o |
2007-03-19 | mergetool: Add support for vimdiff. | James Bowes |
2007-03-14 | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o |