Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 860:8ccbac05cf59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use correct term "closed interval" for ranges.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 09 Aug 2005 11:15:57 +0100
parents 9c918287d10b
children 5a034646e472
line wrap: on
line source

+ hg init
+ hg add a b
+ hg commit -m commit #0 -d 0 0
+ hg commit -mcomment #1 -d 0 0
+ hg update 0
+ hg commit -A -mcomment #2 -d 0 0
removing b
+ hg update 1
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)