| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2007-10-18 | mergetool: add support for ECMerge |  Steffen Prohaska | 1 | -1/+1 |
| 2007-10-18 | mergetool: use path to mergetool in config var mergetool.<tool>.path | Steffen Prohaska | 1 | -0/+6 |
| 2007-06-10 | [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool |  Dan McGee | 1 | -1/+1 |
| 2007-06-07 | War on whitespace |  Junio C Hamano | 1 | -1/+0 |
| 2007-05-03 | Document 'opendiff' value in config.txt and git-mergetool.txt |  Arjen Laarhoven | 1 | -1/+1 |
| 2007-03-29 | Fix minor formatting issue in man page for git-mergetool |  Theodore Ts'o | 1 | -5/+5 |
| 2007-03-18 | mergetool: Add support for vimdiff. |  James Bowes | 1 | -1/+1 |
| 2007-03-13 | Add git-mergetool to run an appropriate merge conflict resolution program | Theodore Ts'o | 1 | -0/+46 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |