git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea4f93e 99474b6)
Merge branch 'da/difftool'
authorJunio C Hamano <redacted>
Tue, 18 Nov 2014 18:16:54 +0000 (10:16 -0800)
committerJunio C Hamano <redacted>
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
git clone https://git.99rst.org/PROJECT