svn commit: r227149 - stable/7/usr.sbin/mergemaster

Doug Barton dougb at
Sun Nov 6 08:01:17 UTC 2011

Author: dougb
Date: Sun Nov  6 08:01:17 2011
New Revision: 227149

  MFC r213573:
  mdoc: drop redundant .Pp and .LP calls
  They have no effect when coming in pairs, or before .Bl/.Bd

Directory Properties:
  stable/7/usr.sbin/mergemaster/   (props changed)

Modified: stable/7/usr.sbin/mergemaster/mergemaster.8
--- stable/7/usr.sbin/mergemaster/mergemaster.8	Sun Nov  6 07:59:34 2011	(r227148)
+++ stable/7/usr.sbin/mergemaster/mergemaster.8	Sun Nov  6 08:01:17 2011	(r227149)
@@ -330,7 +330,6 @@ overrides
 .Pa /etc/mergemaster.rc .
 Here is an example
 with all values commented out:
 .Bd -literal
 # These are options for mergemaster, with their default values listed
 # The following options have command line overrides

More information about the svn-src-stable-7 mailing list