diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-05 12:18:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-05 12:18:11 -0800 |
| commit | 5e6154fb145d66af36e10ef4db7e1d1e9502c501 (patch) | |
| tree | 98e62ba6a698d6a4ed266b98e9a95bc5fe1b1c1a /t/t1501-worktree.sh | |
| parent | c378862b1ec23dd526e318b4c1bfbf826f8dd6b6 (diff) | |
| parent | 72fac66bca302dbecbe42dfa0ddc7e42db2fe567 (diff) | |
| download | git-5e6154fb145d66af36e10ef4db7e1d1e9502c501.tar.gz git-5e6154fb145d66af36e10ef4db7e1d1e9502c501.tar.xz | |
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
Diffstat (limited to 't/t1501-worktree.sh')
0 files changed, 0 insertions, 0 deletions