💾 Archived View for freeshell.de › tldr › git-mergetool.gmi captured on 2023-04-20 at 00:02:09. Gemini links have been rewritten to link to archived content

-=-=-=-=-=-=-

git mergetool

Run merge conflict resolution tools to resolve merge conflicts.

More information.

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).

CC-BY