equal
deleted
inserted
replaced
56 $ hg up 'desc(CA)' |
56 $ hg up 'desc(CA)' |
57 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
57 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
58 $ hg add ccc |
58 $ hg add ccc |
59 $ hg commit -m 'CC' |
59 $ hg commit -m 'CC' |
60 created new head |
60 created new head |
|
61 (consider using topic for lightweight branches. See 'hg help topic') |
61 $ hg outgoing -G |
62 $ hg outgoing -G |
62 comparing with $TESTTMP/main (glob) |
63 comparing with $TESTTMP/main (glob) |
63 searching for changes |
64 searching for changes |
64 @ 2 default draft CC |
65 @ 2 default draft CC |
65 |
66 |
311 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
312 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
312 $ echo aaa > ggg |
313 $ echo aaa > ggg |
313 $ hg add ggg |
314 $ hg add ggg |
314 $ hg commit -m 'CG' |
315 $ hg commit -m 'CG' |
315 created new head |
316 created new head |
|
317 (consider using topic for lightweight branches. See 'hg help topic') |
316 $ hg up 'desc(CF)' |
318 $ hg up 'desc(CF)' |
317 switching to topic babar |
319 switching to topic babar |
318 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
320 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
319 $ hg merge 'desc(CG)' |
321 $ hg merge 'desc(CG)' |
320 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
322 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |