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 /fast-import.c | |
| parent | ae5a97fdd0c553926aabdf324b6d9108b0699bee (diff) | |
| parent | c5ab03f26c992e30f355fba129f70db0f290fcd7 (diff) | |
| download | git-9e8f6e7f6e8817db30a492e32fa92c1daf51b77c.tar.gz git-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 'fast-import.c')
0 files changed, 0 insertions, 0 deletions