Index: head/usr.sbin/etcupdate/etcupdate.8 =================================================================== --- head/usr.sbin/etcupdate/etcupdate.8 +++ head/usr.sbin/etcupdate/etcupdate.8 @@ -870,7 +870,7 @@ 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