Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.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 | 2da2d46862fb |
children | 5c4496ed152d |
line wrap: on
line diff
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -101,7 +101,7 @@ this update spans a branch affecting the a (resolve) b (resolve) aborting update spanning branches! -(use update -m to merge across branches or -C to lose changes) +(use 'hg merge' to merge across branches or '-C' to lose changes) failed abort: outstanding uncommitted changes failed