Junio C Hamano b387c77b12 Sync with v1.8.2.3 ... * maint: Git 1.8.2.3 t5004: avoid using tar for checking emptiness of archive t5004: ignore pax global header file mergetools/kdiff3: do not use --auto when diffing transport-helper: trivial style cleanup		2013-05-09 13:32:54 -07:00
..
araxis
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
ecmerge
emerge
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	mergetools/kdiff3: do not use --auto when diffing	2013-05-09 11:59:39 -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
p4merge	mergetools/p4merge: create a base if none available	2013-03-13 10:46:07 -07:00
tkdiff
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