Created
February 12, 2019 20:20
-
-
Save gregkepler/4628252a7221060b2b3edaf64389d83a 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
| [diff] | |
| tool = meld | |
| [difftool] | |
| prompt = false | |
| [difftool "meld"] | |
| cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" "$LOCAL" "$REMOTE" | |
| [merge] | |
| tool = meld | |
| [mergetool "meld"] | |
| cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment