Last active
April 13, 2017 12:03
-
-
Save jordanrobinson/e8d7b378b43855a225e495821ef2a370 to your computer and use it in GitHub Desktop.
Setting up meld for git merges
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 --diff \"$BASE\" \"$LOCAL\" \"$REMOTE\" --output \"$MERGED\" |
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
| sudo cp meld /bin/ |
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
| nano meld | |
| #!/bin/bash | |
| /mnt/c/Program\ Files\ \(x86\)/Meld/Meld.exe $@ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment