xref: /freebsd/usr.bin/diff3/tests/conflict3.txt (revision 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b) 
1root:someone@example.com
2
3#Basicsystemaliases--theseMUSTbepresent
4MAILER-DAEMON:postmaster
5postmaster:root
6