From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Oct 2015 20:06:56 +0000 (-0700)
Subject: Merge branch 'jk/delete-modechange-conflict'
X-Git-Tag: v2.7.0-rc0~58
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/203501b39fe89193c252ec651d4bf1fafd784b30

Merge branch 'jk/delete-modechange-conflict'

Merging a branch that removes a path and another that changes the
mode bits on the same path should have conflicted at the path, but
it didn't and silently favoured the removal.

* jk/delete-modechange-conflict:
merge: detect delete/modechange conflict
t6031: generalize for recursive and resolve strategies
t6031: move triple-rename test to t3030
---

203501b39fe89193c252ec651d4bf1fafd784b30