#169 Three way merge has problems with braces

pending
nobody
None
4
2012-09-23
2012-05-22
Anonymous
No

OS: Windows 7 x64 and Windows XP 32 Bit
Kdiff3 0.9.95-2 and 0.9.96

I want to perform a three way merge. Please have a look at the screenshot, it shows the problem: In .BASE there are two functions. Then in .THIS the last function is gone. Finally in .OTHER there are also two functions, but the first one is shortened.
However, in the merge result there is a right brace too much. It seems Kdiff3 is misinterpreting the braces. If someone isn\'t looking carefully, the resulting file won\'t compile due to a syntax error.

Discussion

  • Joachim Eibl
    Joachim Eibl
    2012-05-30

    Hi,
    Yes, I see. But in my opinion this is one of the remaining cases where the three-way-merge is not perfect and it can't be improved much. Since the diff-algorithm doesn't know about C/C++ and coding style this is a valid result.
    Joachim