Added status to conflict(8) man page to note that it is deprecated.
[mmh] / test / folder /
drwxr-xr-x   ..
-rwxr-xr-x 558 test-create
-rwxr-xr-x 428 test-total