[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TortoiseMerge bottom pane minimized

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-12-01 22:36:50 CET

Mario wrote:
> Hi all,
> Somehow the bottom pane of the TortoiseMerge is now just two lines high, of
> very little use if you want to see what is happening there. I can't make it
> higher either as it doesn't get that split arrow when I hover the mouse over. I
> noticed on another computer the same behaviour, is it by design or is there
> something wrong on my computers? They're both Win XP SP2, Tortoise 1.4.1 7992.

The bottom pane when diffing 2 files is the *line* diff bar which shows
the difference between a line in file A and a line in file B. It can
only be exactly 2 lines high. If you are looking at long lines, use
Ctrl-wheel mouse to scroll horizontally.

When editing conflicts you get a larger pane at the bottom because then
that pane is the working copy where the changes are saved to. In that
case you do get the split arrow.

This is not new - it has always been that way.

BTW, in 1.4 you can opt to show the line differences in the two top
panes as well as in the line diff bar. That may do what you want.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Dec 1 22:37:04 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.