![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Dec 2007 00:52:59 +0000 (16:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Dec 2007 00:52:59 +0000 (16:52 -0800) |
* jc/merge-recursive-gitlink:
Support a merge with conflicting gitlink change
Support a merge with conflicting gitlink change
Trivial merge