# # # patch "monotone.texi" # from [3e5b9a19d9af8f06af3b499e87d43658e233a14a] # to [171afb5ed700fa435665c7576c6030c30e24d976] # ============================================================ --- monotone.texi 3e5b9a19d9af8f06af3b499e87d43658e233a14a +++ monotone.texi 171afb5ed700fa435665c7576c6030c30e24d976 @@ -9227,7 +9227,9 @@ @section Automation @item Purpose: -Returns a list of revision IDs in which the content was most recently changed, relative to the revision ID specified as @var{id}. This equates to a content mark following the *-merge algorithm. +Returns a list of revision IDs in which the content was most recently changed, +relative to the revision ID specified as @var{id}. This equates to a content mark +following the *-merge algorithm. @item Sample output: @@ -9237,8 +9239,23 @@ @section Automation @item Output format: -Zero or more basic_io stanzas, each specifying a revision ID in which a content mark is set. +Zero or more basic_io stanzas, each specifying a revision ID in which a content +mark is set: address@hidden address@hidden +No content mark is returned if @var{file} is a directory. address@hidden +One content mark is returned if @var{file} is a file and has recently been +changed exclusively in one revision (be it by a commit or merge). address@hidden +Multiple content marks are returned if @var{file} is a file and has recently +been part of a clean merge case. +A clean merge happens when the same change to @var{file} is made on both sides +of the particular merge, together with other unrelated changes, which make the +resulting revisions not collapse into one revision. address@hidden itemize + The complete format: @verbatim 'content_mark'