Merge branch 'master' of git://bogomips.org/git-svnrr/parse-subcommand

* 'master' of git://bogomips.org/git-svn:
  git-svn.perl: close the edit for propedits even with no mods

1 files changed, 1 insertions, 1 deletions

diff --git a/git-svn.perl b/git-svn.perl
index e30df22d89..eeb83d3759 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;