diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-12 16:52:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-12 16:52:59 -0800 |
| commit | d9cf4ec9f7ddcc589351e1ac7b0e3b88537a0b25 (patch) | |
| tree | 09a47b9a6919c46c00b103f2485b711247e1f11e /git-svn.perl | |
| parent | cfa97ae141160486dbe8a786487bcaa965a160f0 (diff) | |
| parent | ff72af00f86cbbaaab57c886c70f9799715ca02f (diff) | |
| download | git-d9cf4ec9f7ddcc589351e1ac7b0e3b88537a0b25.tar.gz | |
Merge branch 'jc/merge-recursive-gitlink'
* jc/merge-recursive-gitlink:
Support a merge with conflicting gitlink change
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions