diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2024-03-15 10:10:46 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2024-03-15 10:12:51 +0000 |
| commit | e1341e5318a8f6b2a2712fae799cb5c59194ea03 (patch) | |
| tree | 69373d617abf25f2aa96b976dcfaffa00c320429 /sbin/mount_nullfs/mount_nullfs.8 | |
| parent | 6bf21b4c0c616e627a685bab58bf884ebf33e031 (diff) | |
stable/13 sbin/mount_nullfs: Resolve conlict in man page
Reported by: Seigo Tanimura <seigo.tanimura@gmail.com>
Pointy hat to: kib
Diffstat (limited to 'sbin/mount_nullfs/mount_nullfs.8')
| -rw-r--r-- | sbin/mount_nullfs/mount_nullfs.8 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8 index 759f7546c49a..ed35ae310e63 100644 --- a/sbin/mount_nullfs/mount_nullfs.8 +++ b/sbin/mount_nullfs/mount_nullfs.8 @@ -90,17 +90,6 @@ flag followed by a comma separated string of options. See the .Xr mount 8 man page for possible options and their meanings. -<<<<<<< HEAD -||||||| parent of 4a2a69c4472c (mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes) -Additionally the following option is supported: -.Bl -tag -width indent -.It Cm nocache -Disable metadata caching in the null layer. -Some lower-layer file systems may force this option. -Depending on the access pattern, -this may result in increased lock contention. -.El -======= Additionally the following option is supported: .Bl -tag -width nocache .It Cm nocache @@ -111,7 +100,6 @@ this may result in increased lock contention. .It Cm cache Force enable metadata caching. .El ->>>>>>> 4a2a69c4472c (mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes) .El .Pp The |