![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jan 2009 08:09:42 +0000 (00:09 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jan 2009 08:09:42 +0000 (00:09 -0800) | ||
| commit | ff32340669a5521ca2b4b547b4853bfe22f60386 | |
| tree | bca331f6b19b2465ca5c71ab879ce03874f9be58 | tree | snapshot |
| parent | 4c6e8aa8f001fa9619dc891c501d0d4389583353 | commit | diff |
| parent | 36e3b5eafe967cb721f5e2bbaa396f979b8ebd7c | commit | diff |
Merge branch 'js/maint-merge-recursive-r-d-conflict'
* js/maint-merge-recursive-r-d-conflict:
merge-recursive: mark rename/delete conflict as unmerged
* js/maint-merge-recursive-r-d-conflict:
merge-recursive: mark rename/delete conflict as unmerged
| merge-recursive.c | diff1 | | diff2 | | blob | history |