--- a/i18n/de.po Fri May 10 23:48:03 2013 +0200
+++ b/i18n/de.po Thu May 16 16:20:10 2013 -0500
@@ -14078,13 +14078,14 @@
#, python-format
msgid "was merge of '%s' successful (yn)?"
-msgstr ""
+msgstr "ist die Zusammenführung von '%s' gelungen (jn)?"
#, python-format
msgid ""
" output file %s appears unchanged\n"
"was merge successful (yn)?"
-msgstr ""
+msgstr "Ausgabedatei %s scheint unverändert\n"
+"ist die Zusammenführung gelungen (jn)?"
msgid "unterminated string"
msgstr "nicht abgeschlossene Zeichenkette"
--- a/mercurial/commands.py Fri May 10 23:48:03 2013 +0200
+++ b/mercurial/commands.py Thu May 16 16:20:10 2013 -0500
@@ -4934,7 +4934,6 @@
"""restore files to their checkout state
.. note::
-
To check out earlier revisions, you should use :hg:`update REV`.
To cancel an uncommitted merge (and lose your changes), use
:hg:`update --clean .`.
--- a/mercurial/help/urls.txt Fri May 10 23:48:03 2013 +0200
+++ b/mercurial/help/urls.txt Thu May 16 16:20:10 2013 -0500
@@ -7,8 +7,8 @@
ssh://[user@]host[:port]/[path][#revision]
Paths in the local filesystem can either point to Mercurial
-repositories or to bundle files (as created by :hg:`bundle` or :hg:`
-incoming --bundle`). See also :hg:`help paths`.
+repositories or to bundle files (as created by :hg:`bundle` or
+:hg:`incoming --bundle`). See also :hg:`help paths`.
An optional identifier after # indicates a particular branch, tag, or
changeset to use from the remote repository. See also :hg:`help