![[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) | ||
| commit | d9cf4ec9f7ddcc589351e1ac7b0e3b88537a0b25 | |
| tree | 09a47b9a6919c46c00b103f2485b711247e1f11e | tree | snapshot |
| parent | cfa97ae141160486dbe8a786487bcaa965a160f0 | commit | diff |
| parent | ff72af00f86cbbaaab57c886c70f9799715ca02f | commit | diff |
Merge branch 'jc/merge-recursive-gitlink'
* jc/merge-recursive-gitlink:
Support a merge with conflicting gitlink change
* jc/merge-recursive-gitlink:
Support a merge with conflicting gitlink change