Merge branch 'jk/delete-modechange-conflict'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:06:56 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:06:57 +0000 (13:06 -0700)
commit203501b39fe89193c252ec651d4bf1fafd784b30
tree66fd8be35b5b3b78365a5673c69d9f710fa259ab
parentf7722a447ab6121f0567cb7f211093983c300a97
parent72fac66bca302dbecbe42dfa0ddc7e42db2fe567
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
merge-recursive.c