Merge branch 'jc/merge-recursive-gitlink'
* jc/merge-recursive-gitlink: Support a merge with conflicting gitlink change
Junio C Hamano committed
Dec 12, 2007 at 16:52 UTC
d9cf4ec9f7ddcc589351e1ac7b0e3b88537a0b25
No changes.