Another D/F conflict not fixed by the en/d-f-conflict-fix series in next was found in the wild, involving multiple file renames across a D/F conflict. That series would have fixed this case too, were it not for a stupid simple bug. Fix it, and add a testcase for good measure. This series is on top of next; it needs both the en/d-f-conflict-fix series and the testcase requires em/checkout-orphan. Elijah Newren (2): t6031: Add a testcase covering multiple renames across a D/F conflict merge-recursive: Fix triple file rename across D/F conflict merge-recursive.c | 1 + t/t6031-merge-recursive.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) -- 1.7.2.1.227.g086c8 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html