![[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) |
* js/maint-merge-recursive-r-d-conflict:
merge-recursive: mark rename/delete conflict as unmerged
merge-recursive: mark rename/delete conflict as unmerged
| 1 | 2 | |||
|---|---|---|---|---|
| merge-recursive.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc merge-recursive.c
Simple merge