#WINDOWS BEYOND COMPARE WINDOWS#
Pretty much the only difference from above is using bc3 instead of bc: git config -global diff.tool bc3 git config -global difftool.prompt false git config -global difftool.bc3 trustExitCode true git config -global merge.tool bc3 git config -global mergetool.bc3 trustExitCode true Git for Windows Configuring Beyond Compare 3 Git for Linux Now, among other things, you can right-click files in VS and choose Compare with Unmodified to open Beyond Compare. Specifically, you need to open git/config in the repo and add the following: tool = bc4 cmd = \"C:\\Program Files\\Beyond Compare 4\\BComp.exe\" \"$LOCAL\" \"$REMOTE\" tool = bc4 cmd = \"C:\\Program Files\\Beyond Compare 4\\BComp.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
Instead of using your global git config, it forces you to change the git config file in the repo. Not to mention, it doesn’t support 3-way merge. However, I don’t find it as useful as I do Beyond Compare. Visual Studio includes a builtin diff viewer that is pretty nice. You don’t need to do anything special to get directory diffs working on Windows. On Windows, in addition to the above commands, you need to tell git the path to bcomp.exe: git config -global difftool.bc.path "c:/program files/beyond compare 4/bcomp.exe" git config -global mergetool.bc.path "c:/program files/beyond compare 4/bcomp.exe"
#WINDOWS BEYOND COMPARE UPDATE#
To make this affect all new sessions, change the dropdown at the bottom of the dialog from Use for this view only to Also update session defaults before you click OK. In the Folder Compare, click the Rules toolbar button (referee icon). The approach I like is updating Beyond Compare to follow the symlinks. There are a couple of ways to fix this ( courtesy of StackOverflow). By default, git uses symlinks to do the directory diff and BC4 will not follow those by default yielding something that looks like this: git difftool -dir-diff), I had to tweak the settings a little bit.
In order to get directory diffs working (e.g. Run these commands from terminal: git config -global diff.tool bc git config -global difftool.prompt false git config -global difftool.bc trustExitCode true git config -global merge.tool bc git config -global mergetool.bc trustExitCode true To get it working on any linux flavor is pretty straight forward. Configuring Beyond Compare 4 Git for Linux It is cross-platform and makes diffs and 3-way merges very easy to understand and visualize. Beyond Compare has been my favorite comparison tool for a while now.
0 kommentar(er)
