From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Jul 2007 08:46:22 +0000 (-0700)
Subject: Merge branch 'ew/svn'
X-Git-Tag: v1.5.3-rc0~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1fd81efad0d65afba91f8fb27b40a6345bfb50de

Merge branch 'ew/svn'

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

1fd81efad0d65afba91f8fb27b40a6345bfb50de