We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 1d37892 commit 4838085Copy full SHA for 4838085
git-rebase--merge.sh
@@ -69,7 +69,7 @@ call_merge () {
69
test -z "$strategy" && strategy=recursive
70
# If cmt doesn't have a parent, don't include it as a base
71
base=$(git rev-parse --verify --quiet $cmt^)
72
- eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
+ eval 'git merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
73
rv=$?
74
case "$rv" in
75
0)
0 commit comments