Last active
March 16, 2019 14:23
-
-
Save panterozo/76171072c745c0c5d574115c6bfb5319 to your computer and use it in GitHub Desktop.
Meld Configuration
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
| # Add the following to your .gitconfig file. | |
| [diff] | |
| tool = meld | |
| [difftool] | |
| prompt = false | |
| [difftool "meld"] | |
| cmd = meld "$LOCAL" "$REMOTE" | |
| # Add the following to your .gitconfig file. | |
| [merge] | |
| tool = meld | |
| [mergetool "meld"] | |
| cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED" | |
| [mergetool] | |
| keepBackup = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment