Added status to conflict(8) man page to note that it is deprecated.
[mmh] / test / repl / test-multicomp
2012-03-24 Ken HornsteinSigh. Turns out last change broke a few tests, because...