Download the latest .dmg package for Mac from here: Meld for OSX Set meld as your git difftool/mergetool by editing your ~/.gitconfig and adding the following lines, as mentioned in the above link: [diff] tool = meld [difftool] prompt = false [difftool “meld”] trustExitCode = true cmd = open -W -a Meld –args \”$LOCAL\” \”$PWD/$REMOTE\” … Read more
The intention is that the user be able to set up points in each of the files being compared, which are supposed to match up. This helps the code-matching algorithm figure out how the two files relate to each other, in cases where the differences are complex. I’m still figuring it out by trial-and-error, setting … Read more
I get the in-terminal diff display. I this should not happen, because I have set up an external diff tool Yes, it should: diff.external is for “in-terminal diff display”. (from git config man page) diff.external If this config variable is set, diff generation is not performed using the internal diff machinery, but using the given … Read more
If you merge a branch A into a branch B the conflicts that you get come from the difference between both branches and not from the difference with master. executing git diff in A or B will give you however the diff with mastere since it is the ancestor Normally the local branch should be … Read more
I feel the existing answers slightly missed the point. Here is my own dog food: Arguments Detail: Diff: $LOCAL $REMOTE Merge: $LOCAL $BASE $REMOTE –auto-merge –output=$MERGED For External Diff, you need to remove $BASE from your argument list. For 3-way merging, you need to click on the External Merge Tool option instead, which will only … Read more
There’s FileMerge.app, which comes with XCode. It can be run as a separate standalone application :
TL;DR (added May 2018) The whole thing is fundamentally at least a little bit confusing because Git lets its internal workings show right through to you. Note that the cases we are concerned with here occur when you run: git checkout somebranch; git rebase origin/their-branch or similar. The rebase has halted temporarily to force you … Read more
Why do you not use git bash for Windows? After install meld simply: git config –global merge.tool meld git config –global mergetool.meld.path “C:\Program Files (x86)\Meld\Meld.exe” <- path to meld here Thats all!
You could use complete unix paths like: PATH=$PATH:/c/python26 git config –global merge.tool meld git config –global mergetool.meld.path /c/Program files (x86)/meld/bin/meld This is what is described in “How to get meld working with git on Windows” Or you can adopt the wrapper approach described in “Use Meld with Git on Windows” # set up Meld as … Read more
You can use an extension for this. Two good options: Gitlens: https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens With this one, you can use the >GitLens: Open Changes with… action to compare with any branch (local or remote). You also can use Git History: https://marketplace.visualstudio.com/items?itemName=donjayamanne.githistory You can see the entire file history and compare with the current version with the >Git: … Read more