Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorAugie Fackler <augie@google.com>
Sun, 27 Nov 2016 20:44:52 -0500
changeset 30542 64b55bffc1c0
parent 30541 342d0cb4f446 (current diff)
parent 30419 819f96b82fa4 (diff)
child 30543 03fae9048fa1
merge with stable
hgext/shelve.py file | annotate | diff | comparison | revisions
i18n/ja.po file | annotate | diff | comparison | revisions
i18n/pt_BR.po file | annotate | diff | comparison | revisions
tests/test-shelve.t file | annotate | diff | comparison | revisions 
--- a/hgext/shelve.py	Fri Nov 25 09:59:39 2016 -0800
+++ b/hgext/shelve.py	Sun Nov 27 20:44:52 2016 -0500
@@ -911,7 +911,7 @@
     files. If specific files or directories are named, only changes to
     those files are shelved.
 
-    In bare shelve(when no files are specified, without interactive,
+    In bare shelve (when no files are specified, without interactive,
     include and exclude option), shelving remembers information if the
     working directory was on newly created branch, in other words working
     directory was on different branch than its first parent. In this
--- a/i18n/ja.po	Fri Nov 25 09:59:39 2016 -0800
+++ b/i18n/ja.po	Sun Nov 27 20:44:52 2016 -0500
@@ -10464,7 +10464,7 @@
 "    指定対象の変更のみが退避されます。"
 
 msgid ""
-"    In bare shelve(when no files are specified, without interactive,\n"
+"    In bare shelve (when no files are specified, without interactive,\n"
 "    include and exclude option), shelving remembers information if the\n"
 "    working directory was on newly created branch, in other words working\n"
 "    directory was on different branch than its first parent. In this\n"
--- a/i18n/pt_BR.po	Fri Nov 25 09:59:39 2016 -0800
+++ b/i18n/pt_BR.po	Sun Nov 27 20:44:52 2016 -0500
@@ -10582,7 +10582,7 @@
 "    engavetadas."
 
 msgid ""
-"    In bare shelve(when no files are specified, without interactive,\n"
+"    In bare shelve (when no files are specified, without interactive,\n"
 "    include and exclude option), shelving remembers information if the\n"
 "    working directory was on newly created branch, in other words working\n"
 "    directory was on different branch than its first parent. In this\n"
--- a/tests/test-shelve.t	Fri Nov 25 09:59:39 2016 -0800
+++ b/tests/test-shelve.t	Sun Nov 27 20:44:52 2016 -0500
@@ -36,7 +36,7 @@
       specific files or directories are named, only changes to those files are
       shelved.
   
-      In bare shelve(when no files are specified, without interactive, include
+      In bare shelve (when no files are specified, without interactive, include
       and exclude option), shelving remembers information if the working
       directory was on newly created branch, in other words working directory
       was on different branch than its first parent. In this situation
mercurial