]> de.git.xonotic.org Git - xonotic/div0-gittools.git/commitdiff
fix unmerging in the branch manager
authorRudolf Polzer <rpolzer@grawp.div0.qc.to>
Sun, 24 Jan 2010 18:20:29 +0000 (19:20 +0100)
committerRudolf Polzer <rpolzer@grawp.div0.qc.to>
Sun, 24 Jan 2010 18:20:29 +0000 (19:20 +0100)
git-branch-manager

index cb6a3abb2b87cb0084a6d801798750e4bb8d68a3..fe034027b0c14d143c8a3f83fb470ab7c38cc359 100755 (executable)
@@ -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: $!";