diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-13 01:13:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 01:13:56 -0800 |
| commit | 9e8f6e7f6e8817db30a492e32fa92c1daf51b77c (patch) | |
| tree | 9bd0d722d8f08422a0141a870a3772a1a8962d62 /t/t4127-apply-same-fn.sh | |
| parent | Merge branch 'ap/maint-apply-modefix' into maint (diff) | |
| parent | merge-recursive: do not clobber untracked working tree garbage (diff) | |
| download | tgif-9e8f6e7f6e8817db30a492e32fa92c1daf51b77c.tar.xz | |
Merge branch 'cb/maint-merge-recursive-fix' into maint
* cb/maint-merge-recursive-fix:
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file
Conflicts:
builtin-merge-recursive.c
Diffstat (limited to 't/t4127-apply-same-fn.sh')
0 files changed, 0 insertions, 0 deletions