Resolve "CONFLICT (delete/modify)" in git

Answer 1

UPDATE Okay, git's recursive merge algorithm does this just fine by itself. I just used too small files to test it so the relative similiarity was beneath the trigger of the rename detection.

If I change one line of a file with two small lines the relative change is very big.

---

Of course I could do something like

git show HEAD^:afile > afile_ancestor
kdiff3 -m afile_ancestor afile bfile

P.S.: Sorry for the broken formatting above. I didn't had switched on JavaScript, so I couldn't see a preview.