summaryrefslogtreecommitdiff
path: root/regress/usr.bin/rcs/merge-eflag.out
blob: 4c05eb38a5cab733736ef7017e231798a7a1e7fa (plain)
1
2
3
4
line1
file3new
line2
file1new