summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbhd <bhd@FreeBSD.org>2016-04-26 18:54:44 +0000
committerbhd <bhd@FreeBSD.org>2016-04-26 18:54:44 +0000
commit01099cbeb7eb81176edfe46de76eb2e2b4ded41b (patch)
tree0bc243acdc715c24a763d66956665cfe33e15d1c /usr.sbin
parent37b282449f5a9f0ee463dea343b572effd048869 (diff)
downloadFreeBSD-src-01099cbeb7eb81176edfe46de76eb2e2b4ded41b.zip
FreeBSD-src-01099cbeb7eb81176edfe46de76eb2e2b4ded41b.tar.gz
Remove redundant word.
Reviewed by: bjk, bcr Differential Revision: https://reviews.freebsd.org/D6064
Diffstat (limited to 'usr.sbin')
-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 f3b3e84..4cc5d69 100644
--- a/usr.sbin/etcupdate/etcupdate.8
+++ b/usr.sbin/etcupdate/etcupdate.8
@@ -870,7 +870,7 @@ utility was written by
Rerunning a merge does not automatically delete conflicts left over from a
previous merge.
Any conflicts must be resolved before the merge can be rerun.
-It it is not clear if this is a feature or a bug.
+It is not clear if this is a feature or a bug.
.Pp
There is no way to easily automate conflict resolution for specific files.
For example, one can imagine a syntax along the lines of
OpenPOWER on IntegriCloud