fetch: use update rather than clean when updating (
issue3246)
We already verify the working directory is "clean" before starting so
there's no advantage to clobbering the working directory.
mdiff: adjust hunk offsets with --ignore-blank-lines (
issue3234)
When diffing the following documents with --ignore-blank-lines (-B):
$ cat > a <<EOF
>
>
>
> b
> x
> d
> EOF
and:
$ cat > b <<EOF
> b
> y
> d
> EOF
the context lines are taken from the first document, even if the lines differ
(with -w or -b) or if the number of lines differ (with -B). In the second case,
we have to adjust the hunk new lines offsets or we end with inconsistent diffs
like (see the @@ offsets):
diff -r
0e66aa54f318 a
--- a/a
+++ b/a
@@ -1,4 +1,3 @@
b
-x
+y
d
Note that having different context lines in a and b means the diff can be
applied but is not invertible.
Reported by Nicholas Riley <com-selenic@sabi.net>
i18n-de: fix rst markup in command output (
issue3247)
i18n-de: fix rst markup in command output (
issue3247)
i18n-de: fix hg command rst markup and quoting (
issue3247)
i18n-de: fix rst markup in command output (
issue3247)