summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.88
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index 57a9487dd7c..01c6d3401c9 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.38 2012/08/28 05:42:07 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.39 2013/07/16 11:13:34 schwarze 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 28 2012 $
+.Dd $Mdocdate: July 16 2013 $
.Dt SYSMERGE 8
.Os
.Sh NAME
@@ -268,9 +268,9 @@ script first appeared in
The
.Nm
shell script was written by
-.An Antoine Jacoutot Aq ajacoutot@openbsd.org
+.An Antoine Jacoutot Aq Mt ajacoutot@openbsd.org
using
.Fx
mergemaster written by
-.An Douglas Barton Aq DougB@FreeBSD.org
+.An Douglas Barton Aq Mt DougB@FreeBSD.org
as a base.