![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Jan 2009 09:15:19 +0000 (01:15 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Jan 2009 09:15:19 +0000 (01:15 -0800) | ||
| commit | 94468bc1f719b7e0009ec0600b178dd5f412d702 | |
| tree | d575fed066ab542840be3ec793fb523491e16677 | tree | snapshot |
| parent | 9e8f6e7f6e8817db30a492e32fa92c1daf51b77c | commit | diff |
| parent | 36e3b5eafe967cb721f5e2bbaa396f979b8ebd7c | commit | diff |
Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
* 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 |