From: divverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Mon, 9 Mar 2009 13:27:02 +0000 (+0000)
Subject: branch-manager fixes
X-Git-Tag: svn-r421~205
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=4a43b9f1ae23163117ad2ae52d8dd289024bb98c

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 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();