diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:06:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:06:57 -0700 |
| commit | 203501b39fe89193c252ec651d4bf1fafd784b30 (patch) | |
| tree | 66fd8be35b5b3b78365a5673c69d9f710fa259ab /sha1_file.c | |
| parent | Merge branch 'jc/add-u-A-default-to-top' (diff) | |
| parent | merge: detect delete/modechange conflict (diff) | |
| download | tgif-203501b39fe89193c252ec651d4bf1fafd784b30.tar.xz | |
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
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions