equal
deleted
inserted
replaced
128 |
128 |
129 $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF |
129 $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF |
130 > c |
130 > c |
131 > EOF |
131 > EOF |
132 rebasing 1:1d1a643d390e "dev: create branch" |
132 rebasing 1:1d1a643d390e "dev: create branch" |
133 note: rebase of 1:1d1a643d390e created no changes to commit |
133 note: rebase of 1:1d1a643d390e "dev: create branch" created no changes to commit |
134 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
134 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
135 rebasing 4:4b019212aaf6 "dev: merge default" |
135 rebasing 4:4b019212aaf6 "dev: merge default" |
136 file 'f-default' was deleted in local [dest] but was modified in other [source]. |
136 file 'f-default' was deleted in local [dest] but was modified in other [source]. |
137 What do you want to do? |
137 What do you want to do? |
138 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
138 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |