From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Apr 2016 01:57:47 +0000 (-0700)
Subject: Merge branch 'da/mergetool-delete-delete-conflict' into maint
X-Git-Tag: v2.8.2~14
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=517736ffcf7e0a81cef938987b4cc4ed82b3408f;p=git-core%2Fgit.git

Merge branch 'da/mergetool-delete-delete-conflict' into maint

"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
---

517736ffcf7e0a81cef938987b4cc4ed82b3408f