bin/56496: etcupdate(8) merge formatting issue

[Hauke Fath <hauke%Espresso.Rhein-Neckar.DE@localhost>]

>Number:         56496
>Category:       bin
>Synopsis:       etcupdate(8) merge formatting issue
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    bin-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Nov 13 13:35:00 +0000 2021
>Originator:     Hauke Fath
>Release:        NetBSD 9.99.92
>Organization:
Falling Raindrops
>Environment:
	
	
System: NetBSD flatpack 9.99.92 NetBSD 9.99.92 (BLACKBOX-$Revision: 1.85 $) #5: Sat Nov 13 00:03:46 CET 2021 hauke@flatpack:/u/scratch/netbsd-build-objects/developer/amd64/sys/arch/amd64/compile/NBLACKBOX amd64
Architecture: x86_64
Machine: amd64
>Description:

	The -current etcupdate(8) file merge has a formatting issue:
	In a merge session, the right hand column expands whitespace
	(tabs, presumably) incorrectly such that even on a 160 col
	xterm most of the lines wrap around.

	This makes the merge mode almost unusable.
 
	
>How-To-Repeat:

	Run etcupdate after a base update, and attempt to merge local
	config file state with updates.

	Find that even in a wide terminal, most of the right-hand side
	will wrap around.

	
>Fix:

	Yes, please.

	

>Unformatted: