Added status to conflict(8) man page to note that it is deprecated.
[mmh] / test / inc / md5sums
2012-02-11 Ken HornsteinRe-work the test suite so it now works with Automake...