Mercurial > hg > mercurial-source

changeset 819:77e121a0d870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update output for test-merge5.
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 31 Jul 2005 17:31:15 -0800
parents 5a55e3011772
children 89985a1b3427
files tests/test-merge5.out
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge5.out
+++ b/tests/test-merge5.out
@@ -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)