branch-manager fixes
git-svn-id: svn://svn.icculus.org/netradiant/trunk@215 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
parent
749ab6b3fa
commit
4a43b9f1ae
|
|
@ -1,3 +1,3 @@
|
|||
master = https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/1.5
|
||||
revisions_applied = 1-321
|
||||
revisions_applied = 1-327
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user