[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Unexpected behavior in (d)iff while interactively working through conflicts--I think diff3 would be nicer

From: Brian W. Fitzpatrick <fitz_at_red-bean.com>
Date: 2007-12-16 20:01:04 CET

On Dec 14, 2007 11:51 AM, David Glasser <glasser@davidglasser.net> wrote:
> The current output, the first time you run (d)iff (ie, assuming you
> haven't edited the merged file yourself) is essentially diff2(r1,
> diff3(mine, r1, r2)).

Correct. And that makes me dizzy.

-Fiz

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 16 20:01:19 2007

This is an archived mail posted to the Subversion Dev mailing list.