Announcement

Collapse
No announcement yet.

Git dir diff doesn't seem to match files

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

  • Git dir diff doesn't seem to match files

    Using v4.0.7 (build 19761)

    FWIW, using Meld works ok wit git's --dir-diff.

    I've followed the Linux Git instructions here:
    http://www.scootersoftware.com/suppo...b_vcs#gitlinux

    Calling
    Code:
    git difftool --dir-diff HEAD~1
    produces the window shown in the screenshot.

    The `test.d` file has not moved, but it's being treated as if they are two different files by beyond compare, making it hard to do the diff (I have to manually select the left and right file).

    How can I fix this?
    Attached Files

  • #2
    Hello,

    The file on the right appears to be a symbolic link. If you go to the Session menu -> Session Settings, Handling tab, and enable to "Follow symbolic links", does this help treat the link as the target, and align the comparison as you expect?
    Aaron P Scooter Software

    Comment


    • #3
      Thanks, that does fix the issue.

      However I have to do this each time I open another diff. Is there a way to set this setting permanently?

      Comment


      • #4
        Originally posted by drey08 View Post
        Thanks, that does fix the issue.

        However I have to do this each time I open another diff. Is there a way to set this setting permanently?
        Ah, there's a setting "Use for this view only" or "Also update session defaults". Selecting the latter makes it permanent.

        You can consider the issue resolved. Thanks for the quick help!

        Comment

        Working...
        X