Mercurial > hg
comparison tests/test-rebase-conflicts.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 | cf8ad0e6c0e4 |
| children | c2380b448265 |
comparison
equal
deleted
inserted
replaced
| 32248:b47e6b0ba6ca | 32249:27e67cfea27f |
|---|---|
| 248 committing manifest | 248 committing manifest |
| 249 committing changelog | 249 committing changelog |
| 250 rebased as 19c888675e13 | 250 rebased as 19c888675e13 |
| 251 rebasing 10:2f2496ddf49d "merge" (tip) | 251 rebasing 10:2f2496ddf49d "merge" (tip) |
| 252 future parents are 11 and 7 | 252 future parents are 11 and 7 |
| 253 already in target | 253 already in destination |
| 254 merge against 10:2f2496ddf49d | 254 merge against 10:2f2496ddf49d |
| 255 detach base 9:e31216eec445 | 255 detach base 9:e31216eec445 |
| 256 searching for copies back to rev 3 | 256 searching for copies back to rev 3 |
| 257 unmatched files in other (from topological common ancestor): | 257 unmatched files in other (from topological common ancestor): |
| 258 f2.txt | 258 f2.txt |