Merge branch 'ng/mergetool-lose-final-prompt'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:51 +0000 (11:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:51 +0000 (11:33 -0700)
commit03e904c...d600afee7a39160aabc79a628916eecc
tree734726e...404a43bebb97e6a036b5ed8a60d7fe5fcopy hash to clipboard (tree)
parent3bc484a...74132332f5bb69401f223e2fe11bfa39copy hash to clipboard (diff)
parentd651a54...8a22a307f5b061ba50c5348ae31e861ccopy hash to clipboard (diff)