Git 1.7.9

diff --git a/git-svn.perl b/git-svn.perl
index e30df22d89d97642f0b99c3a35ee0b2c5c062bb3..eeb83d375931df81bd87ca285c8d0741c14f33a2 100755 (executable)
--- 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;