Git diff beyond compare windows

Lorenzo Gatti Lorenzo Gatti 1, 1 1 gold badge 10 10 silver badges 13 13 bronze badges. What I paste above was the output of my "config" file.

It wasn't exactly the output of the command "git config --list" — diegot. Write cohfig format always changes. This works for Windows 10, VS , Git 2. Vassil Sanych Vassil Sanych 1. Sign up or log in Sign up using Google. Sign up using Facebook. Sign up using Email and Password. Post as a guest Name. Email Required, but never shown. The Overflow Blog. Podcast Making Agile work for data science. Stack Gives Back Featured on Meta. New post summary designs on greatest hits now, everywhere else eventually.

Linked Asked 9 years, 8 months ago. Active 9 years, 8 months ago. Viewed 2k times. Any ideas what the issue might be? Thanks James I'm running 1. Improve this question. James James 10 10 silver badges 19 19 bronze badges.

Just to double check, you do have V3 of Beyond Compare rather than V2? I'm on BC I don't believe the instructions work for BC2. Also, do you need to quote the paths? Yes, it's BC3. It doesn't seem to me like it's even trying to execute beyond compare as the diff is shown on the console. I'm using the mysysgit distribution code. In addition to the above, you need to tell git the path to bcomp. The reason I am using BCompare. When using the new --dir-diff option of the git difftool command:.

Beyond Compare 3 has a bug that is not fixed as of v3. If you want to see a diff of the whole directory, you can run:. That will cycle through each merge conflict in the working copy and as long as you save the file from BC, the conflict will be marked resolved by git hence the mergetool. Configuring Beyond Compare 4 Git for Linux To get it working on any linux flavor is pretty straight forward. Run these commands from terminal: git config --global diff.

By default, git uses symlinks to do the directory diff and BC4 will not follow those by default yielding something that looks like this: broken directory diff There are a couple of ways to fix this courtesy of StackOverflow. Git for Windows On Windows, in addition to the above commands, you need to tell git the path to bcomp.