Junio C Hamano c0acef9b8a Merge branch 'da/p4merge-mktemp-fix' ...

* da/p4merge-mktemp-fix:
  p4merge: fix printf usage

2013-02-14 16:05:56 -08:00

..

araxis

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

bc3

mergetools: use the correct tool for Beyond Compare 3 on Windows

2011-10-15 20:13:55 -07:00

codecompare

Add Code Compare v2.80.4 as a merge / diff tool for Windows

2012-08-10 08:08:08 -07:00

deltawalker

mergetools: add a plug-in to support DeltaWalker

2012-03-05 09:31:47 -08:00

diffuse

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

ecmerge

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

emerge

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

gvimdiff

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

gvimdiff2

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

kdiff3

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

kompare

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

meld

mergetools/meld: Use --help output to detect --output support

2012-02-10 14:53:18 -08:00

opendiff

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

p4merge

p4merge: fix printf usage

2013-02-10 11:40:52 -08:00

tkdiff

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00

tortoisemerge

mergetools: teach tortoisemerge to handle filenames with SP correctly

2013-02-01 18:06:03 -08:00

vimdiff

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

vimdiff2

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

xxdiff

mergetool--lib: Refactor tools into separate files

2011-08-19 00:09:19 -07:00