git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bdebbeb a298604)
Merge branch 'da/mergetool-delete-delete-conflict'
authorJunio C Hamano <redacted>
Wed, 6 Apr 2016 18:39:02 +0000 (11:39 -0700)
committerJunio C Hamano <redacted>
Wed, 6 Apr 2016 18:39:02 +0000 (11:39 -0700)
commite094194f08c3d7f3d9ea1714d34ee20ba82f6851
tree95d250070f71ea960aba8dd8056c8ebc6ad2c02ftree | snapshot
parentbdebbeb3346e9867005947aff356b99a7358e5abcommit | diff
parenta2986045e3da24c850da03eaf2f2e2a56f8d4fffcommit | diff
Merge branch 'da/mergetool-delete-delete-conflict'

"git mergetool" did not work well with conflicts that both sides
deleted.

* da/mergetool-delete-delete-conflict:
  mergetool: honor tempfile configuration when resolving delete conflicts
  mergetool: support delete/delete conflicts
git clone https://git.99rst.org/PROJECT