-- Leo's gemini proxy
-- Connecting to freeshell.de:1965...
-- Connected
-- Sending request
-- Meta line: 20 text/gemini;lang=en-GB
> Run merge conflict resolution tools to resolve merge conflicts.
Launch the default merge tool to resolve conflicts:
git mergetool
List valid merge tools:
git mergetool --tool-help
Launch the merge tool identified by a name:
git mergetool --tool {tool_name}
Don't prompt before each invocation of the merge tool:
git mergetool --no-prompt
Explicitly use the GUI merge tool (see the `merge.guitool` config variable):
git mergetool --gui
Explicitly use the regular merge tool (see the `merge.tool` config variable):
git mergetool --no-gui
> Copyright © 2014—present the tldr-pages team and contributors.
> This work is licensed under the Creative Commons Attribution 4.0 International License (CC-BY).
-- Response ended
-- Page fetched on Fri May 17 00:42:33 2024