mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 'master' of git://bogomips.org/git-svn:
  git-svn.perl: close the edit for propedits even with no mods
This commit is contained in:
Junio C Hamano
2011-12-05 21:02:51 -08:00
parent 7e02a6c63a 93ccbba6ee
commit 4cb5d10b14
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-svn.perl
View File

@ -5389,7 +5389,7 @@ sub apply_diff {
$self->{mergeinfo}); $self->{mergeinfo});
} }
$self->rmdirs if $_rmdir; $self->rmdirs if $_rmdir;
if (@$mods == 0) { if (@$mods == 0 && !defined($self->{mergeinfo})) {
$self->abort_edit; $self->abort_edit;
} else { } else {
$self->close_edit; $self->close_edit;