| commit | 60c91181faf33316211970cd2f332b39acb48399 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Dec 2008 10:41:24 +0000 (15 02:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Dec 2008 10:41:24 +0000 (15 02:41 -0800) | ||
| tree | 0fa0c871b1b2d94e6852bcf2aaa247b07dbf99af | treesnapshot (tar.gz zip) |
| parent | 8befc50c49e8a271fd3cd7fb34258fe88d1dfcad | commitdiff |
| parent | c5ab03f26c992e30f355fba129f70db0f290fcd7 | commitdiff |
Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix
* cb/maint-merge-recursive-fix:
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file
* cb/maint-merge-recursive-fix:
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file
| merge-recursive.c | diff1 | diff2 | blobhistory |