Minor wording glitch in TC case 2

Hi folks,

Dev A renames a FooFolder to BarFolder and commits. Dev B renames a
file within FooFolder and updates -> Tree conflict.

The conflict editor offers to "... merge the changes into file 'BarFolder' ... "

Obviously BarFolder is not a file. The easiest fix is just to remove
the word 'file' from this message.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=1269077
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].