Problem when comparing directories with git

[shiin]

I am trying to use BC to compare to two git commit, but files are not aligned in the comparison view, e.g. there is a file main.cpp on the left and on the right, but they appear on different lines. The file on the right looks like a link and when I open it, I only get the filename again.

I am calling BC with:

git difftool --dir-diff  HEAD~3

My .gitconfig looks like this (taken from https://www.scootersoftware.com/vbul...ontrol-Systems , second post by Aaron) :

[diff]
    tool = bcomp
[difftool]
    prompt = false
[difftool "bcomp"]
    trustExitCode = true
    cmd = "/usr/local/bin/bcomp" "$LOCAL" "$REMOTE"
[merge]
    tool = bcomp
[mergetool]
    prompt = false
[mergetool "bcomp"]
    trustExitCode = true
    cmd = "/usr/local/bin/bcomp" "$LOCAL" "$REMOTE" "$BASE" "$MERGED"

[Aaron]

Hello,

The unaligned files have the same names, but one has a tiny arrow icon, correct? Those would be symlinks. You'll need to enable the Session menu -> Session Settings, Handling tab: Follow symbolic links. This can be for the current view, or update the bottom dropdown with -> Also update session defaults before clicking Ok.