Created
May 6, 2019 19:57
-
-
Save phouverneyuff/ae440ce8aaffea7ce744f3ef550208b1 to your computer and use it in GitHub Desktop.
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
| # This is Git's per-user configuration file. | |
| [user] | |
| # Please adapt and uncomment the following lines: | |
| name = Fabio Leando | |
| email = [email protected] | |
| [merge] | |
| tool = meld | |
| [mergetool "meld"] | |
| cmd = \"C:\\\\Program Files (x86)\\\\Meld\\\\meld\\\\meld.exe\" $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE --output=$PWD/$MERGED |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment