Date: Mon, 14 Jun 2021 17:20:23 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 256606] textproc/kdiff3: missing/extra newlines when merging Message-ID: <bug-256606-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D256606 Bug ID: 256606 Summary: textproc/kdiff3: missing/extra newlines when merging Product: Ports & Packages Version: Latest Hardware: Any OS: Any Status: New Severity: Affects Only Me Priority: --- Component: Individual Port(s) Assignee: kde@FreeBSD.org Reporter: emaste@freebsd.org Flags: maintainer-feedback?(kde@FreeBSD.org) Assignee: kde@FreeBSD.org kdiff3 1.9.2 on FreeBSD 13.0 + some minor kernel changes Using kdiff3 for resolving git merge conflicts I noticed that output files sometimes have extra whitespace, and are missing a newline at EOF. I encountered this within the last month or two. Reproduction steps - create test files: printf 'line 1\nline 2-base\nline 3-base\nline 4\n' > base printf 'line 1\nline 2-theirs\nline 4\n' > theirs printf 'line 1\nline 2-mine\nline 4\n' > mine Invoke kdiff3: kdiff3 -o out base theirs mine Resolve the conflict choosing 'mine', save output Observe that the output file has a blank 3rd line, and has no \x0a at EOF. = By default I have LANG=3Den_CA.UTF-8 but observed also with LANG unset. --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-256606-7788>