Created
January 9, 2018 09:12
-
-
Save alkampfergit/46883dcef9fb4bee39a56ce0e69dcf24 to your computer and use it in GitHub Desktop.
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
[diff] | |
tool = vsdiffmerge | |
[difftool] | |
prompt = true | |
[difftool "vsdiffmerge"] | |
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsDiffMerge.exe\" \"$LOCAL\" \"$REMOTE\" //t | |
keepbackup = false | |
trustexistcode = true | |
[merge] | |
tool = vsdiffmerge | |
[mergetool] | |
prompt = true | |
[mergetool "vsdiffmerge"] | |
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsDiffMerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m | |
keepbackup = false | |
trustexistcode = true |
Author
alkampfergit
commented
Jul 21, 2019
via email
Modify. gitconfig file of your account, it should be in the root of your
account folder
Il ven 19 lug 2019, 18:37 MouthOfMadness <[email protected]> ha
scritto:
… Is there any way to place these settings globally rather per repository?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<https://gist.github.com/46883dcef9fb4bee39a56ce0e69dcf24?email_source=notifications&email_token=AACXRELG6JAFBJVYIB6HUXTQAHUVFA5CNFSM4IFICLKKYY3PNVWWK3TUL52HS4DFVNDWS43UINXW23LFNZ2KUY3PNVWWK3TUL5UWJTQAFVTFC#gistcomment-2975313>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AACXREJ7GZEDCXCWOQNOUWDQAHUVFANCNFSM4IFICLKA>
.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment