equal
deleted
inserted
replaced
630 |
630 |
631 $ hg rebase --collapse -d 1 |
631 $ hg rebase --collapse -d 1 |
632 merging a and d to d |
632 merging a and d to d |
633 merging b and e to e |
633 merging b and e to e |
634 merging c and f to f |
634 merging c and f to f |
|
635 merging f and c to c |
635 merging e and g to g |
636 merging e and g to g |
636 merging f and c to c |
|
637 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob) |
637 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob) |
638 $ hg st |
638 $ hg st |
639 $ hg st --copies --change tip |
639 $ hg st --copies --change tip |
640 A d |
640 A d |
641 a |
641 a |