Commit 4908a743 authored by Ben Boeckel's avatar Ben Boeckel

update-common: fix the comment about what opens the browser

parent b3426ad8
......@@ -163,8 +163,8 @@ popd
if [ -n "$basehash" ]; then
git merge --log -s recursive "-Xsubtree=$subtree/" --no-commit "upstream-$name"
else
# Note: on Windows 'git merge' will open a browser, and the check will fail,
# so use the flag by default.
# Note: on Windows 'git merge --help' will open a browser, and the check
# will fail, so use the flag by default.
unrelated_histories_flag=""
if git --version | grep -q windows; then
unrelated_histories_flag="--allow-unrelated-histories "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment