Mercurial > evolve
changeset 868:3ec90de03562
merge stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 05 Mar 2014 19:08:58 -0800 |
| parents | c6dc5822e640 (current diff) 6a67606e1c34 (diff) |
| children | e9eeef0d07ec |
| files | hgext/evolve.py tests/test-tutorial.t |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Wed Mar 05 15:21:21 2014 -0800 +++ b/hgext/evolve.py Wed Mar 05 19:08:58 2014 -0800 @@ -1798,8 +1798,8 @@ without selected changes is created, becomes the new parent and obsoletes the previous one. - The --include option specify pattern to uncommit - The --exclude option specify pattern to keep in the commit + The --include option specifies patterns to uncommit. + The --exclude option specifies patterns to keep in the commit. Return 0 if changed files are uncommitted. """
--- a/tests/test-tutorial.t Wed Mar 05 15:21:21 2014 -0800 +++ b/tests/test-tutorial.t Wed Mar 05 19:08:58 2014 -0800 @@ -448,8 +448,8 @@ changed in the working directory. A new revision without selected changes is created, becomes the new parent and obsoletes the previous one. - The --include option specify pattern to uncommit The --exclude option - specify pattern to keep in the commit + The --include option specifies patterns to uncommit. The --exclude option + specifies patterns to keep in the commit. Return 0 if changed files are uncommitted.