| commit | 5e6154fb145d66af36e10ef4db7e1d1e9502c501 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Nov 2015 20:18:11 +0000 (5 12:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Nov 2015 20:18:11 +0000 (5 12:18 -0800) | ||
| tree | 98e62ba6a698d6a4ed266b98e9a95bc5fe1b1c1a | treesnapshot (tar.gz zip) |
| parent | c378862b1ec23dd526e318b4c1bfbf826f8dd6b6 | commitdiff |
| parent | 72fac66bca302dbecbe42dfa0ddc7e42db2fe567 | commitdiff |
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
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 | diff1 | diff2 | blobhistory |