[Bug 256606] textproc/kdiff3: missing/extra newlines when merging

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606

Adriaan de Groot <adridg at freebsd.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |adridg at freebsd.org
             Status|New                         |Open

--- Comment #3 from Adriaan de Groot <adridg at freebsd.org> ---
For those not conversant with kdiff3:

- invoke kdiff3 as Ed says, `kdiff3 -o out base theirs mine`
- it comes up with a "Conflicts" dialog, saying Total 2, auto-solved 1, 1
unsolved; click *ok*
- the lower half of the window shows the *output* part, with each line
displayed

```
line 1
<Merge Conflict>
<No src line>
line 4
```

There's a kind of highlight on the first conflict line. Press ctrl-3 **or**
right-mouse-click on that line and select *C* (with the files in the order
given in the command, *base* is *A*, *theirs* is *B*, and *mine* is *C*). The
conflict marker is replaced by the content of the line from file *C*.

Now the number at the bottom says "0 unresolved", and you can hit ctrl-S to
save and ctrl-Q to quit.

Output of `od -c` on the result:

```
0000000    l   i   n   e       1  \n   l   i   n   e       2   -   m   i
0000020    n   e  \n  \n   l   i   n   e       4                        
```

-- 
You are receiving this mail because:
You are the assignee for the bug.