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

[bugzilla-noreply at freebsd.org]

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

--- Comment #5 from commit-hook at FreeBSD.org ---
A commit in branch main references this bug:

URL:
https://cgit.FreeBSD.org/ports/commit/?id=efda9660cc81115e5b149426287b09e44a25f388

commit efda9660cc81115e5b149426287b09e44a25f388
Author:     Adriaan de Groot <adridg at FreeBSD.org>
AuthorDate: 2021-06-14 23:00:52 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-06-14 23:03:16 +0000

    textproc/kdiff3: fix output of merged file

    Fix spurious newlines and missing newline at the end of file.

    Upstream report:        https://bugs.kde.org/show_bug.cgi?id=437570
    Upstream merge request:
https://invent.kde.org/sdk/kdiff3/-/merge_requests/31

    PR:                     256606
    Reported by:            emaste

 textproc/kdiff3/Makefile                           |  1 +
 .../files/patch-src_mergeresultwindow.cpp (new)    | 50 ++++++++++++++++++++++
 2 files changed, 51 insertions(+)

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