equal
deleted
inserted
replaced
86 $ hg up -qC 2 |
86 $ hg up -qC 2 |
87 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF |
87 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF |
88 > c |
88 > c |
89 > EOF |
89 > EOF |
90 rebasing 2:add3f11052fa "other" (tip) |
90 rebasing 2:add3f11052fa "other" (tip) |
91 file 'a' was deleted in other [source] but was modified in local [dest]. |
91 file 'a' was deleted in local [dest] but was modified in other [source]. |
92 What do you want to do? |
92 What do you want to do? |
93 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
93 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
94 |
94 |
95 $ cat b |
95 $ cat b |
96 1 |
96 1 |