equal
deleted
inserted
replaced
581 $ hg merge |
581 $ hg merge |
582 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
582 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
583 (branch merge, don't forget to commit) |
583 (branch merge, don't forget to commit) |
584 $ hg ci -d '4 0' -m 'merge backout of branch1' |
584 $ hg ci -d '4 0' -m 'merge backout of branch1' |
585 $ hg id |
585 $ hg id |
586 22149cdde76d (branch2) tip |
586 d97a8500a969 (branch2) tip |
587 $ hg st -A |
587 $ hg st -A |
588 C default |
588 C default |
589 C file2 |
589 C file2 |
590 $ hg summary |
590 $ hg summary |
591 parent: 4:22149cdde76d tip |
591 parent: 4:d97a8500a969 tip |
592 merge backout of branch1 |
592 merge backout of branch1 |
593 branch: branch2 |
593 branch: branch2 |
594 commit: (clean) |
594 commit: (clean) |
595 update: (current) |
595 update: (current) |
596 phases: 5 draft |
596 phases: 5 draft |