summaryrefslogtreecommitdiff
path: root/mergetools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'da/mergetools-p4' into maintJunio C Hamano2012-11-181-0/+25
|\
| * mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-111-0/+25
* | Merge branch 'da/mergetool-custom'Junio C Hamano2012-10-011-26/+2
|\ \
| * | mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-251-26/+2
| |/
* | Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth2012-08-101-0/+25
|/
* mergetools: add a plug-in to support DeltaWalkerTim Henigan2012-03-051-0/+21
* Merge branch 'jn/ancient-meld-support'Junio C Hamano2012-02-141-1/+1
|\
| * mergetools/meld: Use --help output to detect --output supportjn/ancient-meld-supportJonathan Nieder2012-02-101-1/+1
* | mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts2011-10-151-1/+6
|/
* mergetools/meld: Use '--output' when availableDavid Aguilar2011-08-191-1/+24
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-1915-0/+306