mergetool: Make ECMerge use the settings as specified by the user in the GUI
authorSebastian Schuberth <sschuberth@visageimaging.com>
Tue, 6 May 2008 10:53:56 +0000 (12:53 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 11 May 2008 17:12:19 +0000 (10:12 -0700)
commitf4e9f78...f737e55fd4ea06dbb25b14dd32b872c1
tree191a114...fbe307286b5aae9aaf377f705f5f0dbfcopy hash to clipboard (tree)
parent37c22a4...f801403f71a5e9674d8e314ce575945ecopy hash to clipboard (diff)
git-mergetool.sh