Menu

#200 kdiff3 ignores context during 3-way merges

v1.0_(example)
open
merge (2)
5
2015-02-05
2015-02-05
Pierre pro
No

During a 3-way merge, kdiff3 ignores context lines, such that lines added in "local" in the middle of lines removed in "other" result in lines being put in the middle of nowhere in the output.

To reproduce, run
kdiff3 [--auto] base left right -o merged
with the base, left and right found in the attached attachment.tar

Expected result:
kdiff3 reports a conflict for the lines
procedure-5.5
procedure-5.6

Actual result:
No conflict is reported; if --auto is provided, merge silently succeeds and outputs the "merged" file found in the attached "attachment.tar", where the two lines
procedure-5.5
procedure-5.6
simply appear in the middle of nowhere, outside of any function.

kdiff3: 0.9.96 on Ubuntu Linux

(cross-posted from bugs.kde.org)

1 Attachments

Discussion

Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.