2 Commits (5dcd1b157790232bf0b2c03ed083c8a2ff670663)

Author	SHA1	Message	Date
David Aguilar	e2161bc385	mergetools/kdiff3: do not use --auto when diffing ... The `kdiff3 --auto` help message is, "No GUI if all conflicts are auto- solvable." This flag was carried over from the original mergetool commands. diff_cmd() is for two-way comparisons only so remove the superfluous flag. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2013-05-09 11:59:39 -07:00
David Aguilar	bc7a96a896	mergetool--lib: Refactor tools into separate files ... Individual merge tools are now defined in a mergetools/$tool file which is sourced at runtime. The individual files are installed into $(git --exec-path)/mergetools/. New tools can be added by creating a new file instead of editing the git-mergetool--lib.sh scriptlet. http://thread.gmane.org/gmane.comp.version-control.git/134906/focus=135006 Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2011-08-19 00:09:19 -07:00