3 Commits (d347fb6596f687521543f688667f53a772724d11)

Author	SHA1	Message	Date
Junio C Hamano	f13f9b0eab	mergetool: rename bc3 to bc ... Beyond Compare version 4 works the same way as version 3, so rename the existing "bc3" adaptor to just "bc", while keeping "bc3" as a backward compatible wrapper. Noticed-by: Olivier Croquette <ocroquette@free.fr> Helped-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2014-10-21 11:25:30 -07:00
Pat Thoyts	8850c3da95	mergetools: use the correct tool for Beyond Compare 3 on Windows ... On Windows the bcompare tool launches a graphical program and does not wait for it to terminate. A separate 'bcomp' tool is provided which will wait for the view to exit so we use this instead. Reported-by: Werner BEROUX <werner@beroux.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2011-10-15 20:13:55 -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