summaryrefslogtreecommitdiff
path: root/usr.sbin/etcupdate
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-06-20 09:57:27 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-06-20 09:57:27 +0000
commit01c2b8ac0d5d7a787a7853f0988b505d26cf8136 (patch)
tree7ffd25e4a3ee16884f10363cb4d7334fcb5d0177 /usr.sbin/etcupdate
parentbd0891ceb33055537d889206b80a929c8c83f5ad (diff)
downloadsrc-test2-01c2b8ac0d5d7a787a7853f0988b505d26cf8136.tar.gz
src-test2-01c2b8ac0d5d7a787a7853f0988b505d26cf8136.zip
Notes
Diffstat (limited to 'usr.sbin/etcupdate')
-rw-r--r--usr.sbin/etcupdate/etcupdate.82
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8
index ffd051607312..1e722f9b2c12 100644
--- a/usr.sbin/etcupdate/etcupdate.8
+++ b/usr.sbin/etcupdate/etcupdate.8
@@ -801,7 +801,7 @@ utility first appeared in
The
.Nm
utility was written by
-.An John Baldwin Aq jhb@FreeBSD.org .
+.An John Baldwin Aq Mt jhb@FreeBSD.org .
.Sh BUGS
Rerunning a merge does not automatically delete conflicts left over from a
previous merge.