At the moment whenever I use the git mergetool, it is defaulting the TortoiseSvn mergetool.
Is there a way to configure the git merge开发者_开发问答tool to use TortoiseGit instead?
It could be a path issue (the path for TortoiseSVN/bin
coming first, before TortoiseGit/bin
).
But you could define explicitly the mergetool
you want with a config like:
git config merge.tool tortoise
git config mergetool.tortoise.cmd "c:/Program Files/TortoiseGit/bin/TortoiseMerge.exe" \
/base:"$BASE" /theirs:"$REMOTE" /mine:"$LOCAL" /merged:"$MERGED"
精彩评论