Re: Small Bug in TortoiseMerge

Lübbe Onken wrote:
> Stefan Küng wrote:
>> I can't reproduce this.
>
> Try with these three files (my use case yesterday :-))
>
> Scroll down or "hit F8 :-)" to get to the conflict. Use "theirs before mine"
> in any pane. Click on the vertical scrollbar once. Voilá, you can't scroll
> to the last line in the bottom pane anymore.

Fixed in revision 7378, backported to the 1.4.x branch in revision 7379.

> BTW. Does "undo" do anything at all or is it just a placeholder? If I make a
> mistake when merging I have to reload the files and start over again, which
> is a PITA when I'm almost done...

Yikes! I completely forgot that the "Undo" command is still there. No,
it doesn't do anything right now - I planned to implement this in the
beginning, but never got around to actually do it.
See also http://tortoisesvn.net/issues/?do=details&id=266

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org