X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=branch-manager;h=2fd5a8fdb2ea7b1507b501fd76938812a36e7e9b;hp=78783afbde1a3d1643fa4ed4dd18e430dab4e034;hb=cb5c74a45f6154d14e5c0309c41e7a4eb0f947f1;hpb=b46616ae90c0032d0ab0f89016359c03eb934164 diff --git a/branch-manager b/branch-manager index 78783afb..2fd5a8fd 100755 --- a/branch-manager +++ b/branch-manager @@ -272,6 +272,7 @@ elsif($cmd eq 'merge') open my $fh, '>>', '.commitmsg' or die "open .commitmsg"; print $fh GetLog $first, $last; + print $fh "\n"; close $fh; WriteSettings(); @@ -298,7 +299,7 @@ elsif($cmd eq 'undo') open my $fh, '>>', '.commitmsg' or die "open .commitmsg"; - print $fh "undo the following merge:\n", GetLog $first, last; + print $fh "undo the following merge:\n", GetLog $first, $last; close $fh; WriteSettings();