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

RE: Re: Confused by Tortoise Merge Dialog for Simple Example

From: Neil Russell <nrussell_at_apeg.bc.ca>
Date: Tue, 28 Oct 2014 13:20:55 -0700 (PDT)

You're right I didn't have a newline at the end of my file. I had done the merge with ignore eol and whitespace set thinking that would take care of it.

Anyways I retried the merge with a couple of newlines at the end of the file and the merge dialog makes more sense.

It's still a bit strange since I end up with a newline in the middle of the merged lines but it's good enough for me.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2014-10-28 21:21:04 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

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