artulab.com Git - openbsd/commit

projects / openbsd / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: bc49575) | patch

author	stsp <stsp@openbsd.org>
	Tue, 13 Apr 2021 14:20:23 +0000 (14:20 +0000)
committer	stsp <stsp@openbsd.org>
	Tue, 13 Apr 2021 14:20:23 +0000 (14:20 +0000)
commit	08d4acf6df9a2cd5282efd339e89b74b913004ff
tree	ccfa10c1ccebb295a7359f96991f4f2195bb5b5c	tree \| snapshot
parent	bc49575fdf0d75c10b2619ec4a83633616c070b0	commit \| diff

Fix merging of files that lack a final \n at EOF after a block of common lines.

Problem reported by Josh Rickmar.
ok millert@

usr.bin/cvs/diff3.c		diff \| blob \| history
usr.bin/diff3/diff3prog.c		diff \| blob \| history
usr.bin/rcs/diff3.c		diff \| blob \| history

OpenBSD src

by Ahmet Artu Yildirim