I recommend using Beyond Compare - it has many options and is well worth
the money! https://www.sccotersoftware.com.
On Saturday, 12 February 2022 at 08:27:55 UTC+11 Martin Fuller wrote:
> We often find that TortoiseMerge loses whitespace when doing a 3-way
> merge, and we have tracked it down to the following example:
>
> //base.c and mine.c
> void doStuff() {
> //some code
>
> //some more code
> }
>
> //theirs.c
> void doStuff() {
> //some new code
>
> if (newCondition) {
> //some code
>
> //some more code
> }
> }
>
> Command-line: TortoiseMerge base.c mine.c theirs.c
>
> Expected output: same as theirs.c, for all of the whitespace settings,
> because there is no change between base.c and mine.c.
>
> Actual ouput: same as theirs.c only if "Compare whitespaces" is selected,
> otherwise with some lines unindented.
>
> PS It is not realistic to use "Compare whitespaces" all the time, partly
> because TortoiseMerge does not produce smart comparisons in that case.
>
--
You received this message because you are subscribed to the Google Groups
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/tortoisesvn/9a2d507c-2c84-442f-a789-4791c8edf011n%40googlegroups.com.
