vsmerge as Git mergetool

[Juan Fonseca]

I tried to use vsmerge as the mergetool in Git but it didn't work correctly. It launched and I was able to resolve conflicts but the merged file still had the conflicts with the lines that Git inserts. Has anyone tried this? Below is the text in my .gitconfig.

[merge]
     tool = vsmerge
 [mergetool "vsmerge"]
    cmd = /home/vagrant/slickedit-pro/bin/vsmerge -smart $BASE $LOCAL $REMOTE $MERGED
    keepBackup = false

Thank you.

[Dan]

I will have to look into this.

[Juan Fonseca]

Thank you.

[PiezonTM]

I have used this in the past:

Code: [Select]

[diff]
    tool=vsdiff

[merge]
    tool=vsmerge

[difftool "vsdiff"]
    cmd = /opt/slickedit-pro2017/bin/vsdiff "-r1" "$LOCAL" "$REMOTE"

[mergetool "vsmerge"]
    cmd = /opt/slickedit-pro2017/bin/vsmerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"

Hope this helps.

[Juan Fonseca]

I'll try that. Thank you.

I failed to mention before that vsdiff works everytime.