projects
/
xonotic
/
div0-gittools.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
33e475d
)
call merge tool properly
author
Rudolf Polzer <divverent@alientrap.org>
Sun, 20 Mar 2011 19:53:59 +0000
(20:53 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Sun, 20 Mar 2011 19:54:32 +0000
(20:54 +0100)
git-branch-manager
patch
|
blob
|
history
diff --git
a/git-branch-manager
b/git-branch-manager
index 23a38fbd5b672681b2348e3bf937fa7a3494ad72..2d319857a9024d2ef0e470442c09873601785af4 100755
(executable)
--- a/
git-branch-manager
+++ b/
git-branch-manager
@@
-147,7
+147,9
@@
sub merge_commit($)
if($do_commit)
{
run 'git', 'commit', '-F', '.commitmsg'
- or die "git-commit: $!";
+ or (run 'git', 'mergetool'
+ and run 'git', 'commit', '-F', '.commitmsg')
+ or die "git-commit: $!";
}
}
@@
-197,7
+199,9
@@
sub unmerge_commit($)
if($do_commit)
{
run 'git', 'commit', '-F', '.commitmsg'
- or die "git-commit: $!";
+ or (run 'git', 'mergetool'
+ and run 'git', 'commit', '-F', '.commitmsg')
+ or die "git-commit: $!";
}
}