Using the recommended .gitconf settings from sticky threads on OSX.
When I tried to diff a branch in git to master:
$ git checkout mybranch
$ git difftool --dir-dif master
BC aligned the directories, but within the directories, all the files on the right hand side (the current files from mybranch) were symlinks, and they did not align with the non-symlink files on the left hand side.
I was able to work around this by passing the --no-symlinks argument to difftool, but would be handy to work with symlinks if the names are the same.
When I tried to diff a branch in git to master:
$ git checkout mybranch
$ git difftool --dir-dif master
BC aligned the directories, but within the directories, all the files on the right hand side (the current files from mybranch) were symlinks, and they did not align with the non-symlink files on the left hand side.
I was able to work around this by passing the --no-symlinks argument to difftool, but would be handy to work with symlinks if the names are the same.
Comment