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)
Received on 2014-10-28 21:21:04 CET
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.
Thanks,
Neil
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3090550
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].