Merge branch 'da/mergetool-trust-exit-code' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:27 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:27 +0000 (14:49 -0800)
commitb3dac9c...7858e7b8b9c99a371c67129c2e7909e3
tree8afe6cc...3c61bb789a22fa6a3f645feab88f1fdacopy hash to clipboard (tree)
parent430fd1c...e522d1eff58478eb606bee996b52208fcopy hash to clipboard (diff)
parent2967284...56e9053ee8dd26148c22432a4776a3dccopy hash to clipboard (diff)