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

Re: TortoiseMerge colouring

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 13 Jun 2013 20:38:12 +0200

On 13.06.2013 16:36, Simon Large wrote:
> On 12 June 2013 21:21, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>> On 11.06.2013 00:10, Simon Large wrote:
>>> On 24 May 2013 16:34, Simon Large <simon.tortoisesvn_at_gmail.com> wrote:
>>>> Hi Stefan,
>>>> Friedrich's recent post reminded me about something that has been
>>>> bothering me for ages and I keep forgetting to ask about it.
>>>> If I have TMerge set to inline diff then only the changed portions or
>>>> changed words are highlighted, but the whole section to the right of
>>>> the EOL marker is always shown coloured. I would expect that for added
>>>> or removed lines, but not for changed lines in inline diff mode.
>>> Does this make any sense?
>> I like to keep the lines shown colored. The inline-diff color isn't set
>> to an intense color, just enough to immediately see that there's a diff.
>> And you can configure that color back to white in the settings dialog if
>> you like.
> I don't think we're talking about the same thing. There is no separate
> colour selection for the part after the EOL marker.
> See attached screenshot. The background for the changed line is grey
> which is fine. The inline diff is much brighter, which is also fine.
> But why is the section after the EOL shown as if it were and
> added/removed line? Why not the same grey as the rest of the unchanged
> part of the line?
> There's no way I can change the colour of that part unless I also hide
> all added and removed lines, which I definitely don't want to do.

I see what you mean now.
But I'm not sure it's possible what you want: you want for inline diffed
lines to now show the EOL part in color. But there are inline-diffed
lines that don't show as such but still are marked that way.
Haven't found a way to tell those two apart. And without that, it just
looks plain ugly and wrong.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-13 20:38:21 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.