Remove redundant word.
Reviewed by: bjk, bcr Differential Revision: https://reviews.freebsd.org/D6064
This commit is contained in:
parent
7165836188
commit
7bb0da8d70
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=298658
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user