diff --git a/.patchsets b/.patchsets index 13b83faf..cebd1b56 100644 --- a/.patchsets +++ b/.patchsets @@ -1,3 +1,3 @@ master = https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/1.5 -revisions_applied = 1-321 +revisions_applied = 1-327 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();