Subject: bug#24210: [bug-diffutils] bug#24210: diff3 in diffutils 3.4 is broken

From: Jim Meyering <[email-masked]>
Date: Fri, 12 Aug 2016 09:35:27 -0700

On Fri, Aug 12, 2016 at 7:22 AM, Bastian Beischer
<[email-masked]> wrote:
> Hello,
>
> Please try to run diff3 from diffutils 3.4 as follows:
>
> echo a > a.txt
> echo b > b.txt
> echo c > c.txt
> diff3 a.txt b.txt c.txt
>
> Expected output (with diff3 from diffutils 3.3):
>
> ====
> 1:1c
>  a
> 2:1c
>  b
> 3:1c
>  c
>
> Actual output (with diff3 from diffutils 3.4):
>
> ====3
> 1:1c
> 2:1c
>  a
> 3:1c
>  c
>
> There was only one commit in src/diff3.c between 3.3 and 3.4:
>
> http://git.savannah.gnu.org/cgit/diffutils.git/commit/src?id=3b74a905c5460e7979c53273ac90345860d001a7
>
> Reverting this commit fixes the issue.

Yikes.
Thank you for the report.
I confirm that that patch is erroneous, and will prepare a complete
fix (adding your test and a NEWS entry) shortly.
Looks like diffutils-3.5 will have to be released pretty soon.