zap some rcsmerge stuff
authorderaadt <deraadt@openbsd.org>
Wed, 15 Nov 1995 13:52:30 +0000 (13:52 +0000)
committerderaadt <deraadt@openbsd.org>
Wed, 15 Nov 1995 13:52:30 +0000 (13:52 +0000)
commit00fb0514c8381207f9f9a26086e35cf4f37c5bce
tree4e2c2ee1b669d023097c2b88f132127e326c07ae
parent86543a23748960dca6c2ea0beefc1bc57a106c19
zap some rcsmerge stuff
usr.bin/xargs/pathnames.h