##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge with stable
Augie Fackler -
r30542:64b55bff merge default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -911,7 +911,7 b' def shelvecmd(ui, repo, *pats, **opts):'
911 files. If specific files or directories are named, only changes to
911 files. If specific files or directories are named, only changes to
912 those files are shelved.
912 those files are shelved.
913
913
914 In bare shelve(when no files are specified, without interactive,
914 In bare shelve (when no files are specified, without interactive,
915 include and exclude option), shelving remembers information if the
915 include and exclude option), shelving remembers information if the
916 working directory was on newly created branch, in other words working
916 working directory was on newly created branch, in other words working
917 directory was on different branch than its first parent. In this
917 directory was on different branch than its first parent. In this
Show file before | Show file after | Hide comments
@@ -10464,7 +10464,7 b' msgstr ""'
10464 " 指定対象の変更のみが退避されます。"
10464 " 指定対象の変更のみが退避されます。"
10465
10465
10466 msgid ""
10466 msgid ""
10467 " In bare shelve(when no files are specified, without interactive,\n"
10467 " In bare shelve (when no files are specified, without interactive,\n"
10468 " include and exclude option), shelving remembers information if the\n"
10468 " include and exclude option), shelving remembers information if the\n"
10469 " working directory was on newly created branch, in other words working\n"
10469 " working directory was on newly created branch, in other words working\n"
10470 " directory was on different branch than its first parent. In this\n"
10470 " directory was on different branch than its first parent. In this\n"
Show file before | Show file after | Hide comments
@@ -10582,7 +10582,7 b' msgstr ""'
10582 " engavetadas."
10582 " engavetadas."
10583
10583
10584 msgid ""
10584 msgid ""
10585 " In bare shelve(when no files are specified, without interactive,\n"
10585 " In bare shelve (when no files are specified, without interactive,\n"
10586 " include and exclude option), shelving remembers information if the\n"
10586 " include and exclude option), shelving remembers information if the\n"
10587 " working directory was on newly created branch, in other words working\n"
10587 " working directory was on newly created branch, in other words working\n"
10588 " directory was on different branch than its first parent. In this\n"
10588 " directory was on different branch than its first parent. In this\n"
Show file before | Show file after | Hide comments
@@ -36,7 +36,7 b' shelve has a help message'
36 specific files or directories are named, only changes to those files are
36 specific files or directories are named, only changes to those files are
37 shelved.
37 shelved.
38
38
39 In bare shelve(when no files are specified, without interactive, include
39 In bare shelve (when no files are specified, without interactive, include
40 and exclude option), shelving remembers information if the working
40 and exclude option), shelving remembers information if the working
41 directory was on newly created branch, in other words working directory
41 directory was on newly created branch, in other words working directory
42 was on different branch than its first parent. In this situation
42 was on different branch than its first parent. In this situation
General Comments 0
You need to be logged in to leave comments. Login now