Age | Commit message (Expand) | Author |
---|---|---|
2012-10-25 | Merge branch 'da/mergetools-p4' | Jeff King |
2012-10-11 | mergetools/p4merge: Handle "/dev/null" | David Aguilar |
2012-10-01 | Merge branch 'da/mergetool-custom' | Junio C Hamano |
2012-09-25 | mergetool--lib: Allow custom commands to override built-ins | David Aguilar |
2012-08-10 | Add Code Compare v2.80.4 as a merge / diff tool for Windows | Sebastian Schuberth |
2012-03-05 | mergetools: add a plug-in to support DeltaWalker | Tim Henigan |
2012-02-15 | Merge branch 'jn/ancient-meld-support' | Junio C Hamano |
2012-02-11 | mergetools/meld: Use --help output to detect --output support | Jonathan Nieder |
2011-10-16 | mergetools: use the correct tool for Beyond Compare 3 on Windows | Pat Thoyts |
2011-08-19 | mergetools/meld: Use '--output' when available | David Aguilar |
2011-08-19 | mergetool--lib: Refactor tools into separate files | David Aguilar |