diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:09:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:09:42 -0800 |
| commit | ff32340669a5521ca2b4b547b4853bfe22f60386 (patch) | |
| tree | bca331f6b19b2465ca5c71ab879ce03874f9be58 /builtin-merge-file.c | |
| parent | Merge branch 'mk/gitweb-feature' (diff) | |
| parent | merge-recursive: mark rename/delete conflict as unmerged (diff) | |
| download | tgif-ff32340669a5521ca2b4b547b4853bfe22f60386.tar.xz | |
Merge branch 'js/maint-merge-recursive-r-d-conflict'
* js/maint-merge-recursive-r-d-conflict:
merge-recursive: mark rename/delete conflict as unmerged
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions