TortoiseMerge should always merge whitespace changes

[Martin Fuller]

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.

[Tony Rietwyk]

I recommend using Beyond Compare - it has many options and is well worth the money!  https://www.sccotersoftware.com.

[Martin Fuller]

Thanks for that, but we already have several workarounds.  What we want is to get the bug logged so it will be fixed eventually.