Re: Tree conflicts not showing a reminder at end of merge operation

Charles Lechasseur wrote:
> (Tried to look for this report, but didn't find one, sorry if this
> was reported twice.)
>
> When doing a Merge and tree conflicts are found, Tortoise doesn't
> post a reminder at the end of the merge like it does for other type
> of conflicts. So if there were lots of changes and one tree conflict
> got lost in the shuffle, you need to scroll up to see it because you
> won't know at the end that there was a conflict.

Thanks for the report.
Fixed in r16504.

Stefan

-- 
       ___
  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=2359142
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].