diff options
Diffstat (limited to 'src/recon.ml')
| -rw-r--r-- | src/recon.ml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/recon.ml b/src/recon.ml index 2c619bb..490baf1 100644 --- a/src/recon.ml +++ b/src/recon.ml @@ -116,7 +116,8 @@ let preferRoot: string Prefs.t = "!choose this replica's version for conflicting changes" ("Including the preference \\texttt{-prefer \\ARG{root}} causes Unison always to " ^ "resolve conflicts in favor of \\ARG{root}, rather than asking for " - ^ "guidance from the user. (The syntax of \\ARG{root} is the same as " + ^ "guidance from the user, except for paths marked by the preference " + ^ "\\texttt{merge}. (The syntax of \\ARG{root} is the same as " ^ "for the \\verb|root| preference, plus the special values " ^ "\\verb|newer| and \\verb|older|.) \n\n" ^ "This preference is overridden by the \\verb|preferpartial| preference.\n\n" |