equal
deleted
inserted
replaced
126 |
126 |
127 Full rebase all the way back from branching point: |
127 Full rebase all the way back from branching point: |
128 |
128 |
129 $ hg rebase -r 'only(dev,default)' -d default |
129 $ hg rebase -r 'only(dev,default)' -d default |
130 rebasing 1:1d1a643d390e "dev: create branch" |
130 rebasing 1:1d1a643d390e "dev: create branch" |
|
131 note: rebase of 1:1d1a643d390e created no changes to commit |
131 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
132 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
132 rebasing 4:4b019212aaf6 "dev: merge default" |
133 rebasing 4:4b019212aaf6 "dev: merge default" |
133 remote changed f-default which local deleted |
134 remote changed f-default which local deleted |
134 use (c)hanged version or leave (d)eleted? c |
135 use (c)hanged version or leave (d)eleted? c |
135 rebasing 6:9455ee510502 "dev: merge default" |
136 rebasing 6:9455ee510502 "dev: merge default" |