diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-15 02:41:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-15 02:41:24 -0800 |
| commit | 60c91181faf33316211970cd2f332b39acb48399 (patch) | |
| tree | 0fa0c871b1b2d94e6852bcf2aaa247b07dbf99af /userdiff.h | |
| parent | 8befc50c49e8a271fd3cd7fb34258fe88d1dfcad (diff) | |
| parent | c5ab03f26c992e30f355fba129f70db0f290fcd7 (diff) | |
| download | git-60c91181faf33316211970cd2f332b39acb48399.tar.gz git-60c91181faf33316211970cd2f332b39acb48399.tar.xz | |
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
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions