Added status to conflict(8) man page to note that it is deprecated.
[mmh] / test / new /
drwxr-xr-x   ..
-rwxr-xr-x 4676 test-basic