Skip to content

Instantly share code, notes, and snippets.

@JakeGinnivan

JakeGinnivan/gist:0aae81e58e90b891bfef

Created May 14, 2014 16:10
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save JakeGinnivan/0aae81e58e90b891bfef to your computer and use it in GitHub Desktop.
Save JakeGinnivan/0aae81e58e90b891bfef to your computer and use it in GitHub Desktop.
Download ZIP
Unknown mergetool issue
Raw
gistfile1.txt
git config option merge.tool set to unknown tool: --global
Resetting to default...
This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
tortoisemerge emerge vimdiff
No known merge tool is available.
@JakeGinnivan
Copy link
Author

git config --list

@JakeGinnivan
Copy link
Author

git config --unset merge.tool

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment