mergetool: support delete/delete conflicts
commitfaaab8d571633fc8d98f58f02862f1d0bfa988f7
authorDavid Aguilar <davvid@gmail.com>
Thu, 10 Mar 2016 07:13:58 +0000 (9 23:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 22:07:13 +0000 (10 14:07 -0800)
treee7640a245227c1cf97bf49298c03776d6a8e529d
parent326e5bc91eecf73234ead29636207bc516573e79
mergetool: support delete/delete conflicts

If two branches each move a file into different directories then
mergetool will fail because it assumes that the file being merged, and
its parent directory, are present in the worktree.

Create the merge file's parent directory to allow using the
deleted base version of the file for merge resolution when
encountering a delete/delete conflict.

The end result is that a delete/delete conflict is presented for the
user to resolve.

Reported-by: Joe Einertson <joe@kidblog.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool.sh
t/t7610-mergetool.sh