Mercurial > hg-stable
diff tests/test-alias.t @ 23400:3bd577a3283e stable
merge: be precise about what merged into what in short desc
| author | anatoly techtonik <techtonik@gmail.com> |
|---|---|
| date | Wed, 26 Nov 2014 17:22:09 +0300 |
| parents | a3fee83dba59 |
| children | 975c4fc4a512 |
line wrap: on
line diff
--- a/tests/test-alias.t Tue Nov 25 18:37:28 2014 +0900 +++ b/tests/test-alias.t Wed Nov 26 17:22:09 2014 +0300 @@ -443,7 +443,7 @@ forget forget the specified files on the next commit init create a new repository in the given directory log show revision history of entire repository or files - merge merge working directory with another revision + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -469,7 +469,7 @@ forget forget the specified files on the next commit init create a new repository in the given directory log show revision history of entire repository or files - merge merge working directory with another revision + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -495,7 +495,7 @@ forget forget the specified files on the next commit init create a new repository in the given directory log show revision history of entire repository or files - merge merge working directory with another revision + merge merge another revision into working directory pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit