branch-manager fixes
authordivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Mon, 9 Mar 2009 13:27:02 +0000 (13:27 +0000)
committerdivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Mon, 9 Mar 2009 13:27:02 +0000 (13:27 +0000)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@215 61c419a2-8eb2-4b30-bcec-8cead039b335

.patchsets
branch-manager

index 13b83fa..cebd1b5 100644 (file)
@@ -1,3 +1,3 @@
 master = https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/1.5
-revisions_applied = 1-321
+revisions_applied = 1-327
 
index 78783af..2fd5a8f 100755 (executable)
@@ -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();