equal
deleted
inserted
replaced
81 saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob) |
81 saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob) |
82 $ hg up -qC 2 |
82 $ hg up -qC 2 |
83 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True |
83 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True |
84 rebasing 2:add3f11052fa "other" (tip) |
84 rebasing 2:add3f11052fa "other" (tip) |
85 remote changed a which local deleted |
85 remote changed a which local deleted |
86 use (c)hanged version or leave (d)eleted? c |
86 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
87 |
87 |
88 $ cat b |
88 $ cat b |
89 1 |
89 1 |
90 2 |
90 2 |
91 |
91 |