Created
May 14, 2014 16:10
-
-
Save JakeGinnivan/0aae81e58e90b891bfef to your computer and use it in GitHub Desktop.
Unknown mergetool issue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
git config --unset merge.tool
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
git config --list