Last active
September 29, 2017 13:20
-
-
Save AdrienVR/ea19811951f796b3b042b24f8655d01f to your computer and use it in GitHub Desktop.
Git mergetool generates unwanted .orig files on conflicts
This file contains hidden or 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 --global mergetool.keepBackup false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment