Merge branch 'da/difftool-mergetool-simplify-reporting-status'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Dec 2014 22:31:39 +0000 (14:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Dec 2014 22:31:39 +0000 (14:31 -0800)
commit0ddedd4...6b9b3e8eb3557d8ed28e1a0b354a25f8
treebec8ec6...7d910bce51a681bb81a601709d95c54acopy hash to clipboard (tree)
parente886efd...342cee6722762e654ddc1fdee37315b5copy hash to clipboard (diff)
parent1e86d5b...1dcf31adf11363caa1e96a94612b16f4copy hash to clipboard (diff)