💾 Archived View for freeshell.de › tldr › git-mergetool.gmi captured on 2024-03-21 at 16:44:57. Gemini links have been rewritten to link to archived content
⬅️ Previous capture (2022-04-28)
-=-=-=-=-=-=-
Run merge conflict resolution tools to resolve merge conflicts.
git mergetool
git mergetool --tool-help
git mergetool --tool {tool_name}
git mergetool --no-prompt
git mergetool --gui
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).