Added status to conflict(8) man page to note that it is deprecated.
[mmh] / NEWS
2012-04-22 Ken HornsteinUpdate for post-1.5 release.