Created
January 23, 2021 02:57
-
-
Save benduran/d8041b65d5e173495c049f9573010f84 to your computer and use it in GitHub Desktop.
Configure git on Linux (Ubuntu) to use Meld as the merge and diff tool (also works on WSL if you have an xdesktop installed)
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
| [merge] | |
| tool = meld | |
| [mergetool "meld"] | |
| cmd = meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" --output \"$MERGED\" | |
| path = "/usr/bin/meld" | |
| [diff] | |
| tool = meld | |
| guitool = meld | |
| prompt = false | |
| [difftool "meld"] | |
| cmd = meld \"$LOCAL\" \"$REMOTE\" | |
| path = "/usr/bin/meld" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment