Merge branch 'ew/svn'
commit1fd81efad0d65afba91f8fb27b40a6345bfb50de
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:46:22 +0000 (2 01:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:46:22 +0000 (2 01:46 -0700)
treeb061c0e043619ba3469f23b7c73cbbc43cb62dc1
parent7425dcc95e11c20dc4663d7a376dc9ba0424d843
parent733a65aa5d33196fac708ebd12a98a1060cbf3c2
Merge branch 'ew/svn'

* ew/svn:
  git-svn: allow dcommit to retain local merge information
git-svn.perl