equal
deleted
inserted
replaced
83 $ hg up -qC 2 |
83 $ hg up -qC 2 |
84 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True --config ui.interactive=True << EOF |
84 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True --config ui.interactive=True << EOF |
85 > c |
85 > c |
86 > EOF |
86 > EOF |
87 rebasing 2:add3f11052fa "other" (tip) |
87 rebasing 2:add3f11052fa "other" (tip) |
88 remote changed a which local deleted |
88 remote [source] changed a which local [dest] deleted |
89 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
89 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
90 |
90 |
91 $ cat b |
91 $ cat b |
92 1 |
92 1 |
93 2 |
93 2 |