Mercurial > hg
comparison tests/test-rebase-interruptions.t @ 32249:27e67cfea27f
rebase: rename "target" to "destination" in messages
The help text for rebase calls it "the destination" (never "target"),
so let's use that in messages as well.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 11 May 2017 22:38:15 -0700 |
| parents | 157675d0f600 |
| children | a580b2d65ded |
comparison
equal
deleted
inserted
replaced
| 32248:b47e6b0ba6ca | 32249:27e67cfea27f |
|---|---|
| 184 o 0: 'A' | 184 o 0: 'A' |
| 185 | 185 |
| 186 Abort the rebasing: | 186 Abort the rebasing: |
| 187 | 187 |
| 188 $ hg rebase --abort | 188 $ hg rebase --abort |
| 189 warning: new changesets detected on target branch, can't strip | 189 warning: new changesets detected on destination branch, can't strip |
| 190 rebase aborted | 190 rebase aborted |
| 191 | 191 |
| 192 $ hg tglog | 192 $ hg tglog |
| 193 @ 6: 'Extra' | 193 @ 6: 'Extra' |
| 194 | | 194 | |