stafford williamstools
integrate beyond compare
# diff
git config --global diff.tool bc3
# merge
git config --global merge.tool bc3
git config --global mergetool.bc3.trustExitCode true
tools
integrate beyond compare in wsl
Inside ~/.gitconfig:
[diff]
tool = bcomp
[difftool]
prompt = false
[difftool "bcomp"]
path = "/mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe"
cmd = "/mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe" "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)"
[merge]
tool = bcomp
[mergetool]
prompt = false
[mergetool "bcomp"]
path = "/mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe"
cmd = "/mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe" "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)" "$(wslpath -aw $BASE)" "$(wslpath -aw $MERGED)"
links
Considering Snagit transitioned to an Annual Subscription and the price went up a lot, after their 5-year grandfathering of the maintenance support ends, I might need to switch.