From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Nov 2015 20:18:11 +0000 (-0800)
Subject: Merge branch 'jk/delete-modechange-conflict' into maint
X-Git-Tag: v2.6.3~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5e6154fb145d66af36e10ef4db7e1d1e9502c501?ds=inline;hp=--cc

Merge branch 'jk/delete-modechange-conflict' into maint

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

5e6154fb145d66af36e10ef4db7e1d1e9502c501