Merge branch 'ff/svnimport'
commit731651fe25a7d7a242584e4b85112a610c32a23f
authorJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 06:58:26 +0000 (3 23:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 06:58:26 +0000 (3 23:58 -0700)
tree4f075c7c075b5f14f752484993ece4d077e29df5
parentb0d6e64629aeba96e837972c0fda5e61eebb7ab1
parent65160b8b04f814ab5b2573b32605320ff875f99e
Merge branch 'ff/svnimport'

* ff/svnimport:
  git-svnimport: Improved detection of merges.