Merge branch 'da/mergetool-trust-exit-code'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
commitc4a44e2...e03c4a1558a21c15bb880c9411a37fd5
tree376dbc0...b822f2b74c0c9d7b82639d3637dd926dcopy hash to clipboard (tree)
parenteb60086...c3bb7b9b659d4776c1d3283963e93f1acopy hash to clipboard (diff)
parent2967284...56e9053ee8dd26148c22432a4776a3dccopy hash to clipboard (diff)