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