Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge5.out @ 824:0932bc2fb2be
Merge with BOS
author | mpm@selenic.com |
---|---|
date | Tue, 02 Aug 2005 08:57:32 -0800 |
parents | 0902ffece4b4 77e121a0d870 |
children | 1fe3b14c7044 9c918287d10b |
comparison
equal
deleted
inserted
replaced
818:eef752151556 | 824:0932bc2fb2be |
---|---|
7 removing b | 7 removing b |
8 + hg update 1 | 8 + hg update 1 |
9 this update spans a branch affecting the following files: | 9 this update spans a branch affecting the following files: |
10 b | 10 b |
11 aborting update spanning branches! | 11 aborting update spanning branches! |
12 (use update -m to perform a branch merge) | 12 (use update -m to merge across branches or -C to lose changes) |