Added status to conflict(8) man page to note that it is deprecated.
[mmh] / test / mhmail / attachment.txt
2012-06-19 David LevineForget to add test/mhmail/attachment.txt to last commit.