From a55cffa57fd814947e86bde4dfdf88af06d57e02 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 20 Mar 2011 20:53:59 +0100 Subject: [PATCH] call merge tool properly --- git-branch-manager | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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: $!"; } } -- 2.39.2