Bug 472718

When resolving a merge conflict in line 1, and picking "no src line" as the solution, the result saved to file for this conflict is a newline.

This is a very grave problem, especially in automerge mode, since the merge result is not part of the input data. And in UI mode, the UI is even lying to you …

STEPS TO REPRODUCE
1. Create two input files "x" and "y" with the four lines of content each:

file "x":
a
b
c
e

file "y":
b
c
d
e

2.  Do a merge of these two files to a new file "z", eg. via

kdiff3 -m -o z x y

kdiff will complain about 2 merge conflicts.

3.  Resolve each conflict by choosing the empty block. Kdiff3 will mark these in the merge view as <No src line>

4. Save and quit Kdiff3.

OBSERVED RESULT

Look into the merge result file "z":
- the conflict solution "<No src line>" of merge line 1 was falsely written as an empty line
- the conflict solution "<No src line>" of merge line 4 was correctly not written

EXPECTED RESULT

The "<No src line>" of merge line 1 should not result in any output.


SOFTWARE/OS VERSIONS

KDiff3 Version 1.9.70 (64 bit) (and several older versions)
Lubuntu 23.04, i.e. Ubuntu 23.04 with LXDE desktop environment.