| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2012-11-18 | Merge branch 'da/mergetools-p4' into maint |  Junio C Hamano | 1 | -0/+25 |
| 2012-10-11 | mergetools/p4merge: Handle "/dev/null" |  David Aguilar | 1 | -0/+25 |
| 2012-10-01 | Merge branch 'da/mergetool-custom' | Junio C Hamano | 1 | -26/+2 |
| 2012-09-25 | mergetool--lib: Allow custom commands to override built-ins | David Aguilar | 1 | -26/+2 |
| 2012-08-10 | Add Code Compare v2.80.4 as a merge / diff tool for Windows |  Sebastian Schuberth | 1 | -0/+25 |
| 2012-03-05 | mergetools: add a plug-in to support DeltaWalker |  Tim Henigan | 1 | -0/+21 |
| 2012-02-14 | Merge branch 'jn/ancient-meld-support' | Junio C Hamano | 1 | -1/+1 |
| 2012-02-10 | mergetools/meld: Use --help output to detect --output support |  Jonathan Nieder | 1 | -1/+1 |
| 2011-10-15 | mergetools: use the correct tool for Beyond Compare 3 on Windows |  Pat Thoyts | 1 | -1/+6 |
| 2011-08-19 | mergetools/meld: Use '--output' when available | David Aguilar | 1 | -1/+24 |
| 2011-08-19 | mergetool--lib: Refactor tools into separate files | David Aguilar | 15 | -0/+306 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/mergetools