equal
deleted
inserted
replaced
52 $ hg up 'desc(CA)' |
52 $ hg up 'desc(CA)' |
53 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
53 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
54 $ hg add ccc |
54 $ hg add ccc |
55 $ hg commit -m 'CC' |
55 $ hg commit -m 'CC' |
56 created new head |
56 created new head |
|
57 (consider using topic for lightweight branches. See 'hg help topic') |
57 $ hg outgoing -G |
58 $ hg outgoing -G |
58 comparing with $TESTTMP/main (glob) |
59 comparing with $TESTTMP/main (glob) |
59 searching for changes |
60 searching for changes |
60 @ 2 default draft CC |
61 @ 2 default draft CC |
61 |
62 |
362 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
363 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
363 $ echo aaa > ggg |
364 $ echo aaa > ggg |
364 $ hg add ggg |
365 $ hg add ggg |
365 $ hg commit -m 'CG' |
366 $ hg commit -m 'CG' |
366 created new head |
367 created new head |
|
368 (consider using topic for lightweight branches. See 'hg help topic') |
367 $ hg up 'desc(CF)' |
369 $ hg up 'desc(CF)' |
368 switching to topic babar |
370 switching to topic babar |
369 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
371 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
370 $ hg merge 'desc(CG)' |
372 $ hg merge 'desc(CG)' |
371 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
373 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |