Merge branch 'kh/svn'
authorJunio C Hamano <junkio@cox.net>
Sat, 8 Apr 2006 01:01:55 +0000 (18:01 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 8 Apr 2006 01:01:55 +0000 (18:01 -0700)
* kh/svn:
  git-svnimport: Don't assume that copied files haven't changed


Trivial merge