summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorajacoutot <ajacoutot@openbsd.org>2009-12-06 16:21:36 +0000
committerajacoutot <ajacoutot@openbsd.org>2009-12-06 16:21:36 +0000
commit0aec02cebb508b29b7b650d4f5af40f501e24a48 (patch)
treeb58fec78c615b584eb8625bfe7260c3cbbb8a33f /usr.sbin/sysmerge/sysmerge.8
parentDuring the session's initialization, when playing the passive role, send (diff)
downloadwireguard-openbsd-0aec02cebb508b29b7b650d4f5af40f501e24a48.tar.xz
wireguard-openbsd-0aec02cebb508b29b7b650d4f5af40f501e24a48.zip
Add /var/db/locate.database and /var/games/tetris.scores to IGNORE_FILES.
ok sthen@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.86
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index 34a0dcbbf16..388a443f39c 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.28 2009/08/23 20:06:32 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.29 2009/12/06 16:21:36 ajacoutot Exp $
.\"
.\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: August 23 2009 $
+.Dd $Mdocdate: December 6 2009 $
.Dt SYSMERGE 8
.Os
.Sh NAME
@@ -149,6 +149,8 @@ The following files will always be skipped from comparison:
.Pa /etc/passwd ,
.Pa /etc/motd ,
.Pa /etc/myname ,
+.Pa /var/db/locate.database ,
+.Pa /var/games/tetris.scores ,
.Pa /var/mail/root .
.Pp
The