From: Junio C Hamano <junkio@cox.net>
Date: Sun, 4 Jun 2006 06:58:26 +0000 (-0700)
Subject: Merge branch 'ff/svnimport'
X-Git-Tag: v1.4.0-rc1~12
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=731651fe25a7d7a242584e4b85112a610c32a23f;p=git.git

Merge branch 'ff/svnimport'

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

731651fe25a7d7a242584e4b85112a610c32a23f