freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-07 04:36:52 -10:00
Code Issues Packages Projects Releases Wiki Activity

diff3: add 3 missing files from the testsuite

Browse Source 
Fixes:	2cfca8e710
This commit is contained in:
Baptiste Daroussin committed 2026-02-13 20:26:02 +01:00
1 parent 06d07d4af1
commit 284a0aa96e
2 files changed
+44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

usr.bin/diff3/tests/conflict-Em.out
+19
View File
@@ -0,0 +1,19 @@
<<<<<<< conflict3.txt
root:[email protected]
=======
#root:[email protected]
>>>>>>> conflict2.txt
<<<<<<< conflict3.txt
#Basicsystemaliases--theseMUSTbepresent
MAILER-DAEMON:postmaster
postmaster:root
=======
#Basicsystemaliases--theseMUSTbepresent
MAILER-DAEMON:postmaster
postmaster:root
#Generalredirectionsforpseudoaccounts
_dhcp:root
_pflogd:root
>>>>>>> conflict2.txt
usr.bin/diff3/tests/conflict-merge.out
+25
View File
@@ -0,0 +1,25 @@
<<<<<<< conflict3.txt
root:[email protected]
||||||| conflict1.txt
# root: [email protected]
=======
#root:[email protected]
>>>>>>> conflict2.txt
<<<<<<< conflict3.txt
#Basicsystemaliases--theseMUSTbepresent
MAILER-DAEMON:postmaster
postmaster:root
||||||| conflict1.txt
# Basic system aliases -- these MUST be present
MAILER-DAEMON: postmaster
postmaster: root
=======
#Basicsystemaliases--theseMUSTbepresent
MAILER-DAEMON:postmaster
postmaster:root
#Generalredirectionsforpseudoaccounts
_dhcp:root
_pflogd:root
>>>>>>> conflict2.txt