Added status to conflict(8) man page to note that it is deprecated.
[mmh] / test / sequences /
2012-02-23 David LevineAdded test-flist and test-mark sequences tests.