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

Re: prop conflict editing and newlines

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-11-26 10:05:45 CET

On Nov 24, 2007 9:44 PM, Karl Fogel <kfogel@red-bean.com> wrote:
> "David Glasser" <glasser@davidglasser.net> writes:
> > Hmm, so I got a prop conflict on 1.4.x and selected (e)dit and got this:
> >
> > <<<<<<< (modified)
> > [...lots of stuff]=======
> > [...lots more stuff]>>>>>>>
> > (latest)

Yeah, it definitely didn't seem quite so long in my emacs buffer with
truncation instead of wrapping... sorry about that.

--dave 

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 26 10:06:02 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.