xref: /freebsd/usr.bin/diff3/tests/conflict1.txt (revision 3fdbd8a07a2dcb8fe3cec19fc59ef064453e4755)
1# root: me@my.domain
2
3# Basic system aliases -- these MUST be present
4MAILER-DAEMON: postmaster
5postmaster: root
6