# # # patch "monotone.html" # from [0a763ef488cdd54bfffdbbd7b21cad34bc475edb] # to [cf07fbe8469163a0dd10c04a990e5c96ef2ae55c] # # patch "monotone.pdf" # from [ed9d5bb14232d90512b00b9fcd5f7c681a50c776] # to [d1bfb1f9ac4249cdabd6348624b37638e9e28987] # ============================================================ --- monotone.html 0a763ef488cdd54bfffdbbd7b21cad34bc475edb +++ monotone.html cf07fbe8469163a0dd10c04a990e5c96ef2ae55c @@ -44,7 +44,7 @@ version control tools.
Complete table of contents
The merge command normally will perform as many merges as necessary to merge all current heads of a branch. However, when @@ -2794,7 +2794,7 @@ any file with a name matching one of the
The conflicts file format is as output by the automate -show_conflicts command; see Siehe Automation. +show_conflicts command; see See Automation.
Content conflicts that can be resolved by the internal line merger
have resolutions, so they will not show up in subsequent
@@ -4264,7 +4264,7 @@ adjust the expression used with the Lua
regular expression is correct for many programming languages. You can
adjust the expression used with the Lua hook
get_encloser_pattern
; Hooks. For the regular expression
-syntax, Siehe Regexps.
+syntax, See Regexps.
--unified requests the “unified diff” format, the default.
--context requests the “context diff” format (analogous to
@@ -7431,7 +7431,7 @@ line merger, Siehe Conflicts, for more information on conflict resolutions.
+ See Conflicts, for more information on conflict resolutions.
This section contains the entire source code of the standard hook file,
that is built in to the monotone executable, and read before any user
@@ -14136,7 +14136,7 @@ end
[1] We
+ [1] We
say sha1 values are “unique” here, when in fact there is a
small probability of two different versions having the same sha1
value. This probability is very small, so we discount it.resolved_internal
-
external_diff (
file_path,
old_data,
new_data,
is_binary,
diff_args,
old_rev,
new_rev)
regex.search(
regexp,
string)
register_command(
name,
params,
abstract,
description,
function)
Anhang A Default hooks
+Appendix A Default hooks
wait(
pid)
: Additional Lua Functions
-Fußnoten
Footnotes