facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

merge with stable

Browse Source
This commit is contained in:
Matt Mackall 2013-05-16 16:20:10 -05:00
commit 1fb1e9a700
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
i18n/de.po
View File

@ -14078,13 +14078,14 @@ msgstr ""
#, 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"

1
mercurial/commands.py
View File

@ -4934,7 +4934,6 @@ def revert(ui, repo, *pats, **opts):
"""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 .`.

4
mercurial/help/urls.txt
View File

@ -7,8 +7,8 @@ Valid URLs are of the form::
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