summaryrefslogtreecommitdiff
path: root/mergetools
AgeCommit message (Expand)AuthorFilesLines
2012-10-01Merge branch 'da/mergetool-custom'Libravatar Junio C Hamano1-26/+2
2012-09-25mergetool--lib: Allow custom commands to override built-insLibravatar David Aguilar1-26/+2
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsLibravatar Sebastian Schuberth1-0/+25
2012-03-05mergetools: add a plug-in to support DeltaWalkerLibravatar Tim Henigan1-0/+21
2012-02-14Merge branch 'jn/ancient-meld-support'Libravatar Junio C Hamano1-1/+1
2012-02-10mergetools/meld: Use --help output to detect --output supportLibravatar Jonathan Nieder1-1/+1
2011-10-15mergetools: use the correct tool for Beyond Compare 3 on WindowsLibravatar Pat Thoyts1-1/+6
2011-08-19mergetools/meld: Use '--output' when availableLibravatar David Aguilar1-1/+24
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar15-0/+306