HomeFreeBSD

diff3: seperate old and new markers from file markers

Description

diff3: seperate old and new markers from file markers

With -A and -m output the conflict markers are not tied to the file
name. Seperate out these markers.

Sponsored by: Klara, Inc.

Details

Provenance
thjAuthored on Apr 19 2022, 2:38 PM
Parents
rG19780592633e: ssh: remove duplicate setting of MAIL env var
Branches
Unknown
Tags
Unknown