#76 Split Diff At Selection problems

[Gervase Lam]

Kdiff3 v0.9.91 on Windows 2000)

[In real life, the files have lines above below the attached files. The attached files are in a tar file because for some reason SourceForge doesn't allow files that are 20 bytes or less.]

PART 1:

(1) Load file_a, file_b and file_c as files A, B and C into Kdiff3 for merging.

(2) Select Merge->Choose A Everywhere.

(3) Highlight the X character.

(4) Select Merge->Split Diff At Selection.

Merge conflict in output panel is below the Z from file_a even though according to the three file windows above, the 'Z' character should above the conflict.

PART 2:

(1) Highlight the Merge Conflict diff.

(2) Click the A button.

You now have an output file with the Z from file_a twice!!

PART 3:

(1) Load file_a, file_b and file_c as files A, B and C into Kdiff3 for merging.

(2) Select Merge->Choose A Everywhere.

(3) Highlight the Y character.

(4) Select Merge->Split Diff At Selection.

The following message box is displayed:

Kdiff3.exe has generated errors and will be closed by Windows. You will need to restart the program.

An error log is being created.

[Gervase Lam]