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

Re: TortoiseMerge and Auto Merge

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Wed, 28 Jul 2010 08:30:53 +0100

On 28 July 2010 08:10, Edwin <edwintai_at_gmail.com> wrote:
> Dears,
>    Recently,we face large merge works in C++ source.Found a strange
> event about svn udpate auto merge with those files. if code comments
> end with //===== ,then the merge result would ignore next line which
> is not commnets.Is that an issue or I can config to avoid ? thanks

Where did you hear that? Is this an issue you can reproduce or just a rumour?

Simon 

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2639442
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-07-28 09:31:03 CEST

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.