Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update output for test-merge5.
authorBryan O'Sullivan <bos@serpentine.com>
Sun, 31 Jul 2005 17:31:15 -0800
changeset 819 77e121a0d870
parent 815 5a55e3011772
child 820 89985a1b3427
Update output for test-merge5.
tests/test-merge5.out file | annotate | diff | comparison | revisions 
--- a/tests/test-merge5.out	Sat Jul 30 09:01:59 2005 -0800
+++ b/tests/test-merge5.out	Sun Jul 31 17:31:15 2005 -0800
@@ -9,4 +9,4 @@
 this update spans a branch affecting the following files:
  b
 aborting update spanning branches!
-(use update -m to perform a branch merge)
+(use update -m to merge across branches or -C to lose changes)
Mercurial