beyond compare with `git difftool --dir-diff` -- Hitting an issue with sym-links
Using this will work:
git difftool --dir-diff --no-symlinks
From the git doc:
--[no-]symlinks
git difftool's default behavior is create symlinks to the working tree when run in --dir-diff mode and the right-hand side of the comparison yields the same content as the file in the working tree.
Specifying --no-symlinks instructs git difftool to create copies instead. --no-symlinks is the default on Windows.
In addition to sixtyfootersdude's suggestion, another option is to make Beyond Compare follow symbolic links. This will align symlinks with files of the same name.
In the Folder Compare, click the Rules toolbar button (referee icon). Go to the Handling tab. Check Follow symbolic links.
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.
Snapshots:
