[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: Alexandre Guillemé <alexandreguilleme_at_gmail.com>
Date: Tue, 28 Oct 2014 10:03:59 +0100

Maybe you didn'y have end of line after "Change 1"
so when you added "Change 2", you also added a "CR/LF" after Change 1, so
the line is different

2014-10-27 22:15 GMT+01:00 Neil Russell <nrussell_at_apeg.bc.ca>:

> Ok, figured out what happened, if you get the captcha wrong you need to
> select the file again. Anyways, I have attached the screenshot again.
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3090510
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_tortoisesvn.tigris.org].


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-10-28 10:10:24 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.