# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1368739210 18000
# Node ID 4b9e5b71dfa9b427bc73b15ebbcad51c1145b548
# Parent  0b564cf359a7b9f410b5aac6168a6a17ecadf376# Parent  15aef461facdeaf3f8cc42b6d6c95e0768537d84
merge with stable

diff -r 0b564cf359a7 -r 4b9e5b71dfa9 i18n/de.po
--- 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"
diff -r 0b564cf359a7 -r 4b9e5b71dfa9 mercurial/commands.py
--- 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 .`.
diff -r 0b564cf359a7 -r 4b9e5b71dfa9 mercurial/help/urls.txt
--- 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