Mercurial > hg > pyhgsh
diff tests/test-merge5.out @ 819:77e121a0d870
Update output for test-merge5.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun, 31 Jul 2005 17:31:15 -0800 |
parents | 0902ffece4b4 |
children | 0932bc2fb2be |
line wrap: on
line diff
--- 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)