From: Rudolf Polzer Date: Sun, 20 Mar 2011 19:53:59 +0000 (+0100) Subject: call merge tool properly X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a55cffa57fd814947e86bde4dfdf88af06d57e02;p=xonotic%2Fdiv0-gittools.git call merge tool properly --- diff --git a/git-branch-manager b/git-branch-manager index 23a38fb..2d31985 100755 --- 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: $!"; } }