summaryrefslogtreecommitdiff
path: root/mergetools
AgeCommit message (Expand)Author
2013-02-10p4merge: fix printf usageDavid Aguilar
2012-12-27mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderDavid Aguilar
2012-10-25Merge branch 'da/mergetools-p4'Jeff King
2012-10-11mergetools/p4merge: Handle "/dev/null"David Aguilar
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth
2012-03-05mergetools: add a plug-in to support DeltaWalkerTim Henigan
2012-02-14Merge branch 'jn/ancient-meld-support'Junio C Hamano
2012-02-10mergetools/meld: Use --help output to detect --output supportJonathan Nieder
2011-10-16mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts
2011-08-19mergetools/meld: Use '--output' when availableDavid Aguilar
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar