Merge branch 'ff/svnimport'
authorJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 06:58:26 +0000 (23:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 06:58:26 +0000 (23:58 -0700)
* ff/svnimport:
  git-svnimport: Improved detection of merges.


Trivial merge