Page MenuHomeFreeBSD
Files F167457663

D6064.diff
No OneTemporary
Actions

D6064.diff
View Options

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

File Metadata

Mime Type
text/plain
Expires
Sat, Aug 22, 9:40 PM (15 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37110570
Default Alt Text
D6064.diff (605 B)

Event Timeline