#
#
# patch "monotone.texi"
#  from [171afb5ed700fa435665c7576c6030c30e24d976]
#    to [ce013122c5f540df1e48aa56e7452d73887efa35]
#
============================================================
--- monotone.texi	171afb5ed700fa435665c7576c6030c30e24d976
+++ monotone.texi	ce013122c5f540df1e48aa56e7452d73887efa35
@@ -4964,13 +4964,13 @@ @subheading Single file conflict resolut
 
 @var{file} must be a bookkeeping path; under @file{_MTN}.
 
-This inserts a @var{resolved_user file} conflict resolution in the
+This inserts a @var{resolved_user_left file} conflict resolution in the
 conflicts file.
 
 @item user @var{file}
 The file contents are replaced by the contents of the specified file.
 
-This inserts a @var{resolved_user file} conflict resolution in the
+This inserts a @var{resolved_user_left file} conflict resolution in the
 conflicts file.
 
 @item drop