branch-manager fixes

git-svn-id: svn://svn.icculus.org/netradiant/trunk@215 61c419a2-8eb2-4b30-bcec-8cead039b335

diff --git a/.patchsets b/.patchsets
index 13b83faf56a1dc703d61d01eea6e6538be7b0f18..cebd1b56afc0988eb701918792bd8d8b9f767bcf 100644 (file)
--- 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 78783afbde1a3d1643fa4ed4dd18e430dab4e034..2fd5a8fdb2ea7b1507b501fd76938812a36e7e9b 100755 (executable)
--- 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();