Search found 6 matches

by CircleCode
Tue Feb 17, 2015 12:53 am
Forum: Support (DiffMerge)
Topic: weird results git dir-diff option
Replies: 10
Views: 10156

Re: weird results git dir-diff option

axlrosen wrote:Hi, any progress on this bug? It's unfortunately a real blocker for me for using DiffMerge with git.
axlrosen: until this bug is fixed, I use

Code: Select all

git difftool --dir-diff --no-symlink
and it works, even if it is not the better way to do this.
by CircleCode
Wed Jan 08, 2014 8:14 am
Forum: Support (DiffMerge)
Topic: weird results git dir-diff option
Replies: 10
Views: 10156

Re: weird results git dir-diff option

jeffhostetler wrote:Sorry for the confusion.
It's Ok, I suspected this was what you said, but just wanted to be sure :-)

Thanks for the feedback, and the bug opening :-)
by CircleCode
Wed Jan 08, 2014 3:25 am
Forum: Support (DiffMerge)
Topic: weird results git dir-diff option
Replies: 10
Views: 10156

Re: weird results git dir-diff option

What do you mean by
jeffhostetler wrote:I'll log this.
Does this mean you log it in your bug-tracker, or log it in release notes ?
by CircleCode
Sun Jan 05, 2014 6:22 am
Forum: Support (DiffMerge)
Topic: weird results git dir-diff option
Replies: 10
Views: 10156

Re: weird results git dir-diff option

Hi,

Difftool configuration is OK, and it works like a charm. The problem is that when used with the dir-diff option, git create symlinks of files to be compared, and it seems diffmerge consider that it should not compare symlinks, even if they share the same name...
by CircleCode
Fri Jan 03, 2014 11:19 am
Forum: Support (DiffMerge)
Topic: weird results git dir-diff option
Replies: 10
Views: 10156

Re: weird results git dir-diff option

I know that git provides the --no-symlink option, but for a big repo, this can be a problem

and this option was finely supported in older diffmerge versions…
by CircleCode
Fri Jan 03, 2014 10:27 am
Forum: Support (DiffMerge)
Topic: weird results git dir-diff option
Replies: 10
Views: 10156

weird results git dir-diff option

when used through

Code: Select all

git difftool --dir-diff
git does create symlinks for the files to be compared, then diffmerge no more compare them…