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

Re: Feature request: SHow inline diffs in TortoiseMerge single pane view

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 19 Dec 2016 19:45:26 +0100

On 18.12.2016 19:03, Sven Strickroth wrote:
> Hi,
> when I use TortoiseMerge and activated the single pane view, there are no inline diff displayed.
> Displaying the inline diffs could improve the readability of the diffs. Take GitHub, who tries to show inline diffs in unified diff view (cf. https://github.com/csoltenborn/GoogleTestAdapter/commit/e680a899fca92abce8ade3106b2ba370963a6429).

inline diffs are only shown for single-line changes.
I thought about that before, but since all my test files had multi-line
changes I never thought about implementing it.

We could show inline diffs if the changes in a block spread over the
same amount of lines, e.g., two lines removed, two lines added.
But it won't work if the blocks have different amount of lines.

I'll have a look next week - I'm away this whole week...


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-12-19 19:45:34 CET

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