Merge branch 'rh/mergetool-regression-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 23:12:16 +0000 (15:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 23:12:16 +0000 (15:12 -0800)
commit7cef7fa...ab5de8ae39ece585005b19334aee6a4d
tree507a336...a03bb45f4036e3447a6aaccedfb07edacopy hash to clipboard (tree)
parent1c16df2...b19e8d37d896e68c92d8341d6e60b4dccopy hash to clipboard (diff)
parentd0e0cfe...45e0c88ca2f4d4ed9f1d2871b659d872copy hash to clipboard (diff)
t/t7610-mergetool.sh