From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Apr 2016 18:39:02 +0000 (-0700)
Subject: Merge branch 'da/mergetool-delete-delete-conflict'
X-Git-Tag: v2.9.0-rc0~158
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e094194f08c3d7f3d9ea1714d34ee20ba82f6851

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

e094194f08c3d7f3d9ea1714d34ee20ba82f6851