From 6c347cda6dc422ae3ee0335608e2d6c0ccca1e6c Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Tue, 15 Jul 2014 09:12:09 +0000
Subject: [PATCH] new dir /usr/share/sysmerge

---
 etc/mtree/4.4BSD.dist | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index f7d3feb2ac4..8f5d95e6d77 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.254 2014/07/15 09:03:00 sthen Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.255 2014/07/15 09:12:09 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -680,6 +680,10 @@ usr
             ..
         ..
 
+	# ./usr/share/sysmerge
+        sysmerge
+        ..
+
         # ./usr/share/tabset
         tabset
         ..
-- 
2.20.1