TortoiseMerge and Auto Merge

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

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2639401

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-07-28 09:11:04 CEST