Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-help.out @ 2019:ced2d3620f95
add merge command. means same thing as "update -m".
repo.addchangegroup method now returns number of heads modified and added,
so command line can tell whether update or merge needed. this makes
tiny change to ssh wire protocol, but change is backwards compatible.
pull command now returns 0 if no changes to pull.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 29 Mar 2006 10:27:16 -0800 |
parents | 9bbc7b304c34 |
children | a59da8cc35e4 |
line wrap: on
line diff
--- a/tests/test-help.out +++ b/tests/test-help.out @@ -59,6 +59,7 @@ list of commands (use "hg help -v" to sh locate locate files matching specific patterns log show revision history of entire repository or files manifest output the latest or given revision of the project manifest + merge Merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision paths show definition of symbolic path names @@ -100,6 +101,7 @@ list of commands (use "hg help -v" to sh locate locate files matching specific patterns log show revision history of entire repository or files manifest output the latest or given revision of the project manifest + merge Merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision paths show definition of symbolic path names