diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-07 11:09:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-07 11:09:27 +0300 |
| commit | a19528c9fd85454204ff76cd58923072c83594b1 (patch) | |
| tree | 3f88886a5eac7538098dcf5cca3b53e7148ab006 /gitweb | |
| parent | 960e0eb3eae8d1a5db754ebe44c0ccb414b855ad (diff) | |
| parent | 60c91181faf33316211970cd2f332b39acb48399 (diff) | |
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 'gitweb')
0 files changed, 0 insertions, 0 deletions