diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:09:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:09:27 -0800 |
| commit | a19528c9fd85454204ff76cd58923072c83594b1 (patch) | |
| tree | 3f88886a5eac7538098dcf5cca3b53e7148ab006 /builtin-count-objects.c | |
| parent | Merge branch 'kk/maint-http-push' (diff) | |
| parent | Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix (diff) | |
| download | git-a19528c9fd85454204ff76cd58923072c83594b1.tar.gz git-a19528c9fd85454204ff76cd58923072c83594b1.zip | |
Merge branch 'cb/merge-recursive-fix'
* cb/merge-recursive-fix:
merge-recursive: do not clobber untracked working tree garbage
modify/delete conflict resolution overwrites untracked file
Diffstat (limited to 'builtin-count-objects.c')
0 files changed, 0 insertions, 0 deletions