Re: How to read 3-way differences in TortoiseMerge?
From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 28 Jul 2008 16:55:57 +0200
Robert Dailey wrote:
> No, it will show you (most likely) the diff between 10 & 48. Because
You will see that, but only if you did an update after you've last
> However, if the Merge happens and it includes several revisions, I would
The same here: if you have updated after you last committed that file,
> Perhaps my expectations are incorrect? What was the reason behind how it
TSVN does not know which files are affected in an update *before* the
-- ___ oo // \\ "De Chelonian Mobile" (_,\/ \_/ \ TortoiseSVN \ \_/_\_/> The coolest Interface to (Sub)Version Control /_/ \_\ http://tortoisesvn.net
This is an archived mail posted to the TortoiseSVN Users mailing list.