recyclablewaste_at_gmail.com wrote:
> Version: 1.5.99, build 15222
>
> Take any chunk of code and select option: "Use text block from 'mine'
> before 'theirs'" and it works beautifully. It separates the opposing
> sides with 'mine' on top and 'theirs' just below that, both now
> highlighted yellow as if both files are inserting new lines of code
> into the file.
>
> Now, select option: "Use text block from 'theirs' before 'mine" and
> it separates the opposing sides with 'mine' (yes, mine) on top and
> 'theirs' just below that, both still highlighted red as if I selected
> the *first option* and they still conflicted. Luckily, the selection
> is displayed correctly in the merged-preview, and I'm assuming it
> saves correctly yet I am unsure as I'm writing this as I see it.
>
> I believe it was intended to display on the opposing sides 'theirs'
> on top and 'mine' just below that, both now highlighted yellow as if
> both files are inserting new lines of code.
>
> It's actually kind of confusing if you do large amounts of code and
> there's a complete disconnect in comparing the three after already
> having selected the second option.
Fixed in r15273.
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=1108525
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-05 18:56:32 CET