This is a well-known key to Git corresponding to a particular version of well-known comparison tools available in the market ( bc3 corresponds to the third version of the Beyond Compare tool). Path = c:/program files/Beyond Compare 3/bcomp.exe The above command creates the below entry in the. You will know it in a short while): git config -global "c:/program files/beyond compare 3/bcomp.exe" Then you run below command ( Running this command is redundant in this particular case and is required in some specialized cases only. gitconfig found in the %userprofile% directory: The above command creates the below entry in file. The first command that we run is as below: git config -global diff.tool bc3 All the details that I've shared are equally useful for any diff tool in general, so I am sharing it here: Reproducing my answer from this question which was more specific to setting Beyond Compare as diff tool for Git. Prefab use "C:\Program Files\Perforce\p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" * use "%programs%/Utilities/DiffMerge.app/Contents/MacOS/DiffMerge" -nosplash -m -t1="Incoming Changes" -t2="Base" -t3="Working Copy" -r="%d" "%l" "%b" "%r" * use "%programs%/DiffMerge.app/Contents/MacOS/DiffMerge" -nosplash -m -t1="Incoming Changes" -t2="Base" -t3="Working Copy" -r="%d" "%l" "%b" "%r" * use "%programs%\SourceGear\Common\DiffMerge\sgdm.exe" -nosplash -m -t1="Incoming Changes" -t2="Base" -t3="Working Copy" -r="%d" "%l" "%b" "%r" * use "%programs%\SourceGear\DiffMerge\DiffMerge.exe" -nosplash -m -t1="Incoming Changes" -t2="Base" -t3="Working Copy" -r="%d" "%l" "%b" "%r" * use "/opt/plasticscm4/client/mergetool" -b=%b -s=%l -d=%r -r=%d * use "/opt/plasticscm/client/mergetool" -b=%b -s=%l -d=%r -r=%d * use "%programs%/PlasticSCM/client/mergetool" -b=%b -s=%l -d=%r -r=%d * use "%programs%\PlasticSCM4\client\mergetool.exe" -b=%b -s=%l -d=%r -r=%d * use "%programs%\PlasticSCM5\client\mergetool.exe" -b=%b -s=%l -d=%r -r=%d * use "%programs%/p4merge.app/Contents/Resources/launchp4merge" "%b" "%r" "%l" "%d" * use "%programs%/Araxis Merge.app/Contents/Utilities/compare" -3 -a2 -wait -title1:"Other" -title2:"Base" -title3:"Local" "%l" "%b" "%r" "%d" * use "%programs%/Beyond Compare.app/Contents/MacOS/bcomp" "%r" "%l" "%b" "%d" * use "/usr/bin/opendiff" %r %l -ancestor %b -merge %d
Prefab use "%programs%\YouFallbackMergeToolForPrefabsHere.exe" "%l" "%r" "%b" "%d" Unity use "%programs%\YouFallbackMergeToolForScenesHere.exe" "%l" "%r" "%b" "%d" # On OSX %programs% is replaced with "/Applications" and "$HOME/Applications" thereby resulting in two entries to try out
Araxis merge unity windows#
# On Windows %programs% is replaced with "C:\Program Files" and "C:\Program Files (x86)" there by resulting in two entries to try out # %d is replaced with a path where the result should be written to
# %b is replaced with the common base version # %r is replaced with the path of the incoming remote version # %l is replaced with the path of you local version # on other that the default fallbacks listed below. # Modify the next two lines if scene or prefab files should fallback 安装一款合适的 fallback merge tool,作为Unity Automerge 失败后的补救措施。推荐 Diff Merge.