RE: [Kdiff3-user] End of line chars when merging

[Stephen D. <sda...@es...>]

Hi Joachim,=20

> I assume you are aware of the option "Line end style" in the=20
> KDiff3 editor options. This of course sets the line end style=20
> for all merged files.

Sorry I hadn't spotted that one. This is sufficient for me. Thanks.
Being able to override it on the command line might be useful.

> Currently autodetection is not implemented. It's probably not=20
> that hard.
> But if one file has one style and the other file has the=20
> another line end style then a user query would be necessary.

Asking the user when there is a mismatch is probably sensible.

But you could consider the line-end (at least the CR) to be part of the
line, and perform the diff/merge including them. =20

Looking at the source, there is the KDiff3 Diff/merge option which
seems to essentially do the above on the inputs:
  m_pOptionDialog->m_bPreserveCarriageReturn
but when merging, the result seems to loose any CRs that were preserved.
(It is also not possible to see the CRs - as far as I can tell, even
with show whitespace enabled)

Out of interest I tried a test on bc2, and it seems to recognize the
difference in ending (when show whitespace is selected), but when I
transfer a line from the dos file to the unix file, it also seems to
have lost track that that line had dos line endings. Attached png shows
the effect.

> Let's see ...

Thanks,
 Stephen

PS I also noticed that in the merge output window, tabs can't be=20
distinguished from spaces even when whitespace display is enabled.