Added status to conflict(8) man page to note that it is deprecated.
authorDavid Levine <levinedl@acm.org>
Mon, 25 Jun 2012 00:03:05 +0000 (19:03 -0500)
committerDavid Levine <levinedl@acm.org>
Mon, 25 Jun 2012 00:03:05 +0000 (19:03 -0500)
commit75360e381600d61a389f71e31d4ed46fdc24ffeb
tree2a236e69954c53cb554ca1d3e43ebe02be143c98
parent5200594b19e81959d1d249e9feaad4ec0b02f5c2
Added status to conflict(8) man page to note that it is deprecated.
docs/pending-release-notes
man/conflict.man