aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
Commit message (Expand)AuthorAge
* mergetool: add support for ECMergeSteffen Prohaska2007-10-18
* mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska2007-10-18
* [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetoolDan McGee2007-06-10
* War on whitespaceJunio C Hamano2007-06-07
* Document 'opendiff' value in config.txt and git-mergetool.txtArjen Laarhoven2007-05-03
* Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o2007-03-29
* mergetool: Add support for vimdiff.James Bowes2007-03-18
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-13