summaryrefslogtreecommitdiff
path: root/mergetools
AgeCommit message (Expand)Author
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