X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-svn.perl;h=eeb83d375931df81bd87ca285c8d0741c14f33a2;hb=b5c9f1c1b0ed9c91463b9f46a7c9dff3efc53773;hp=e30df22d89d97642f0b99c3a35ee0b2c5c062bb3;hpb=cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b;p=git.git

diff --git a/git-svn.perl b/git-svn.perl
index e30df22d8..eeb83d375 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -5389,7 +5389,7 @@ sub apply_diff {
 			               $self->{mergeinfo});
 	}
 	$self->rmdirs if $_rmdir;
-	if (@$mods == 0) {
+	if (@$mods == 0 && !defined($self->{mergeinfo})) {
 		$self->abort_edit;
 	} else {
 		$self->close_edit;