svn commit: r298658 - head/usr.sbin/etcupdate
Bjoern Heidotting
bhd at FreeBSD.org
Tue Apr 26 18:54:45 UTC 2016
Author: bhd (doc committer)
Date: Tue Apr 26 18:54:44 2016
New Revision: 298658
URL: https://svnweb.freebsd.org/changeset/base/298658
Log:
Remove redundant word.
Reviewed by: bjk, bcr
Differential Revision: https://reviews.freebsd.org/D6064
Modified:
head/usr.sbin/etcupdate/etcupdate.8
Modified: head/usr.sbin/etcupdate/etcupdate.8
==============================================================================
--- head/usr.sbin/etcupdate/etcupdate.8 Tue Apr 26 18:20:41 2016 (r298657)
+++ head/usr.sbin/etcupdate/etcupdate.8 Tue Apr 26 18:54:44 2016 (r298658)
@@ -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
More information about the svn-src-all
mailing list