How can I configure sdiff as a merge tool for git?
I am still looking for a good command line (no GUI) git merge tool as I do
not know vim or emacs. I found the following on how to use sdiff for
merging, which seems pretty simple.
I cannot seem to make sdiff work properly. I currently have the following
in my .gitconfig file, but git mergetool complains that git config option
merge.tool set to unknown tool: sdiff. I have tried different cmd (with
variables $BASE $LOCAL $REMOTE $MERGED), but to no avail.
[merge]
conflictstyle = diff3
tool = sdiff
[mergetool "sdiff"]
path = /usr/bin/sdiff
What is the correct configuration to make sdiff work as a merge tool for
git? Alternatively, if you know of a better command-line tool that does
not have a steep learning curve, I would like to know.
No comments:
Post a Comment