projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfa97ae ff72af0)
Merge branch 'jc/merge-recursive-gitlink'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Dec 2007 00:52:59 +0000 (16:52 -0800)
committerJunio 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


Trivial merge
Git—the stupid content tracker