Andrew's git / gitweb.git / diff
?
Merge branch 'da/difftool'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Nov 2014 18:16:54 +0000 (10:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Nov 2014 18:16:55 +0000 (10:16 -0800)
Fix-up to a new feature in 'master'.

* da/difftool:
difftool: honor --trust-exit-code for builtin tools

1  2 
git-mergetool--lib.sh patch | diff1 | diff2 | blob | history
diff --cc git-mergetool--lib.sh
Simple merge