Merge branch 'da/mergetool-delete-delete-conflict'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:02 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:02 +0000 (11:39 -0700)
commite094194...08c3d7f3d9ea1714d34ee20ba82f6851
tree95d2500...0f71ea960aba8dd8056c8ebc6ad2c02fcopy hash to clipboard (tree)
parentbdebbeb...346e9867005947aff356b99a7358e5abcopy hash to clipboard (diff)
parenta298604...e3da24c850da03eaf2f2e2a56f8d4fffcopy hash to clipboard (diff)