Добрейшей души человек (igrowing) wrote,
Добрейшей души человек
igrowing

Meld as default diff tool in git

To set Meld as default compare tool in git under Windows, make sure the C:\Users\YOUR_USER_NAME\.gitconfig file has following:
[diff]
tool = meld
[difftool "meld"]
cmd = "\"c:/Program Files (x86)/Meld/Meld.exe\" \"$LOCAL\" \"$REMOTE\""
[alias]
meld = difftool -t meld --dir-diff

This can be achieved by simple edit or with command lines:
git config --global merge.tool meld
git config --global mergetool.meld.path "C:\Program Files (x86)\Meld\Meld.exe"

First command line is enough for setting Meld as default diff tool under Linux.

Troubleshooting:

- If Meld still does not open, check your_project/.git/config file. It should NOT include the lines above. If the lines are included for some reason then remove them.

- If you encounter this error under Windows (/mingw64/libexec/git-core/git-mergetool--lib: line 124: c:/Program Files (x86)/Meld/Meld.exe: Permission denied) uncheck 'Run as Administrator' in Properties->Compatibility of meld.exe.
Tags: computers, freeware, modification, software, для себя, полезно
Subscribe

  • Math fun

    Paul Dirac has found a method to represent any natural number using only 3 twos and mathematical operations: Where number of square roots is the…

  • Via ferrata is like sex...

    1. Once experienced it you want it again and again. 2. You never really know how is it until you do this. 3. Every time it's excitment and…

  • The swap

    До свадьбы парни интересуются малышками, а девушки - добыванием средств. После свадьбы интересы парней и девушек взаимоменяются. Before wedding…

  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    switch
    default userpic

    Your reply will be screened

    Your IP address will be recorded 

    Help
  • 0 comments