#
#
# patch "monotone.texi"
#  from [d031b1410d067d6b2d87f56f234061e8e187b2be]
#    to [8ba30dea64425bb4417afca11769134cffed3a82]
#
============================================================
--- monotone.texi	d031b1410d067d6b2d87f56f234061e8e187b2be
+++ monotone.texi	8ba30dea64425bb4417afca11769134cffed3a82
@@ -3727,7 +3727,7 @@ @heading Identifying control files
 here, just in case a situation arises where you need to go ``under the
 hood''.
 
address@hidden Existing control files
address@hidden Existing control files and directories
 
 The following control files are currently used. More control files may be added
 in the future, but they will follow the patterns given above.
@@ -3759,12 +3759,31 @@ @heading Existing control files
 commit. The user may add content to this file while they work.  Upon a
 successful commit monotone will empty the file making it ready for the
 next edit/commit cycle.
address@hidden _MTN/commit
+If a commit fails, f.e. because a header field could not be parsed
+properly, then this file will contain a dump of the complete contents
+which have been saved through the editor.  After the information have been
+recovered from this file, it has to be removed explicitely, since a new commit
+won't be possible as long as this file exists.
 @item _MTN/inodeprints
 If this file exists, monotone considers the directory to be in
 @ref{Inodeprints} mode, and uses this file to cache the inodeprints.
 @item _MTN/debug
 If monotone detects a bug in itself or crashes, then before exiting it
 dumps a log of its recent activity to this file, to aid in debugging.
address@hidden _MTN/bisect
+Contains the current state of an ongoing bisection.  See @ref{Bisecting}
+for more information.
address@hidden _MTN/update
+Remembers the update / previous base revision of the workspace when
+the @code{u:} selector is used.  See @ref{Selectors} for more information.
address@hidden _MTN/conflicts
+The default file which is used by monotone to read and write merge conflicts
+for conflict resolution.  See @ref{Conflicts} for more information.
address@hidden _MTN/resolutions
+The directory in which monotone moves unversioned, conflicting files from
+a workspace to, in case @command{update} or other commands are called with
+the @option{--move-conflicting-paths} option.
 @end table