X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-svn.perl;h=eeb83d375931df81bd87ca285c8d0741c14f33a2;hb=cb2ed324fc917db0b79d7b1f3756575ffa5f70d5;hp=e30df22d89d97642f0b99c3a35ee0b2c5c062bb3;hpb=d899cf559b6a93006993752e7a89d13606380227;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;