diff options
| author | Ulrich Spörlein <uqs@FreeBSD.org> | 2010-10-08 12:40:16 +0000 |
|---|---|---|
| committer | Ulrich Spörlein <uqs@FreeBSD.org> | 2010-10-08 12:40:16 +0000 |
| commit | 0d9deed52c5ed3b24d2da5ec3a0a172fe9092a96 (patch) | |
| tree | b3bc1578c597e5672077e41ccd208441fd2d7f64 /usr.sbin/mergemaster | |
| parent | 7558f6b4f393bba0bb7774274e201ae91731f960 (diff) | |
| download | src-test2-0d9deed52c5ed3b24d2da5ec3a0a172fe9092a96.tar.gz src-test2-0d9deed52c5ed3b24d2da5ec3a0a172fe9092a96.zip | |
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 27157918326b..ab33b31eb974 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -328,7 +328,6 @@ overrides .Pa /etc/mergemaster.rc . Here is an example with all values commented out: -.Pp .Bd -literal # These are options for mergemaster, with their default values listed # The following options have command line overrides |