Mercurial > evolve
comparison tests/test-tutorial.t @ 769:e2a463e1e7c8 stable
tutorial: use long form of argument for the sake of clarity
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 09 Jan 2014 21:10:42 -0800 |
| parents | b116de5dc70d |
| children | 303d27c76021 |
comparison
equal
deleted
inserted
replaced
| 768:b116de5dc70d | 769:e2a463e1e7c8 |
|---|---|
| 239 | 239 |
| 240 | 240 |
| 241 instead of merging my head with the new one. I'm going to rebase my work | 241 instead of merging my head with the new one. I'm going to rebase my work |
| 242 | 242 |
| 243 $ hg diff | 243 $ hg diff |
| 244 $ hg rebase -d 9ca060c80d74 -s 4d5dc8187023 | 244 $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 |
| 245 merging shopping | 245 merging shopping |
| 246 merging shopping | 246 merging shopping |
| 247 | 247 |
| 248 | 248 |
| 249 My local work is now rebased on the remote one. | 249 My local work is now rebased on the remote one. |