diff --git a/git-svn.perl b/git-svn.perl
index e30df22d89d97642f0b99c3a35ee0b2c5c062bb3..712eeebe17f4fe73c09c66b98012bf97d697a843 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
my ($base_rev, $head) = ($partial ? $self->rev_map_max_norebuild(1) :
(undef, undef));
my ($log, $ctx) =
- command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
+ command_output_pipe(qw/rev-list --pretty=raw --reverse/,
($head ? "$head.." : "") . $self->refname,
'--');
my $metadata_url = $self->metadata_url;
$self->{mergeinfo});
}
$self->rmdirs if $_rmdir;
- if (@$mods == 0) {
+ if (@$mods == 0 && !defined($self->{mergeinfo})) {
$self->abort_edit;
} else {
$self->close_edit;