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