]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ea4f93e 99474b6)
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)
commit3f78278beb9792368de7edbbb031c3a88e0038a1
tree42d7a2d7309fffd683ddd62b507ae1d65bea1a64tree | snapshot
parentea4f93eb99038329bbd692c5c8246e5ec8c11da9commit | diff
parent99474b6340dbcbe58f6c256fdee231cbadb060f4commit | diff
Merge branch 'da/difftool'

Fix-up to a new feature in 'master'.

* da/difftool:
  difftool: honor --trust-exit-code for builtin tools
git-mergetool--lib.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.