Announcement

Collapse
No announcement yet.

Dir diff with git not working as expected

Collapse
X
 
  • Filter
  • Time
  • Show
Clear All
new posts

  • Dir diff with git not working as expected

    On Windows I've frequently compared two git branches with git difftool --dir-diff branch2. When I do this on macOS Mojave, it still works, but the files are "shifted". I can easily see the folder differences but can't compare files. BC 4.2.10, git 2.23.0. How can I fix this?

    Relevant in .gitconfig:
    [diff]
    tool = bc3

    Click image for larger version  Name:	Screenshot.png Views:	0 Size:	17.1 KB ID:	81517

  • #2
    The file on the right with the arrow on the icon is a symbolic link. The default settings don't align a standard file with a symbolic link. To make them align, click the Rules toolbar button (referee icon). Go to the Handling tab. Check Follow symbolic links.
    Chris K Scooter Software

    Comment

    Working...
    X