Merge branch 'master' of git://bogomips.org/git-svn

* 'master' of git://bogomips.org/git-svn: git-svn.perl: close the edit for propedits even with no mods
huyle · Dec 6, 2011 · 4cb5d10 · 4cb5d10
2 parents 7e02a6c + 93ccbba
commit 4cb5d10
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;