From: Rudolf Polzer <rpolzer@grawp.div0.qc.to>
Date: Sun, 24 Jan 2010 18:20:29 +0000 (+0100)
Subject: fix unmerging in the branch manager
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdiv0-gittools.git;a=commitdiff_plain;h=10afee364458be691a69df189cbbc7995407e9a5

fix unmerging in the branch manager
---

diff --git a/git-branch-manager b/git-branch-manager
index cb6a3ab..fe03402 100755
--- a/git-branch-manager
+++ b/git-branch-manager
@@ -160,7 +160,7 @@ sub unmerge_commit($)
 		}
 		open my $fh, '>', '.commitmsg'
 			or die ">.commitmsg: $!";
-		print $fh "UNMERGE\n$cmsg" . "::stable-branch::merge=$r\n"
+		print $fh "UNMERGE\n$cmsg" . "::stable-branch::unmerge=$r\n"
 			or die ">.commitmsg: $!";
 		close $fh
 			or die ">.commitmsg: $!";