Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge7.out @ 2019:ced2d3620f95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7544700fd931
children b2ae81a7df29
line wrap: on
line diff
--- a/tests/test-merge7.out
+++ b/tests/test-merge7.out
@@ -4,7 +4,7 @@ adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
-(run 'hg update' to get a working copy)
+(run 'hg heads' to see heads, 'hg merge' to merge)
 merge: warning: conflicts during merge
 merging test.txt
 merging test.txt failed!
@@ -14,7 +14,7 @@ adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
-(run 'hg update' to get a working copy)
+(run 'hg heads' to see heads, 'hg merge' to merge)
 merge: warning: conflicts during merge
 resolving manifests
  force None allow 1 moddirstate True linear False