Mercurial > evolve
comparison tests/test-tutorial.t @ 1470:c3f6e97c71b1
merge with stable
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 30 Jun 2015 18:32:12 -0700 |
parents | 8ca31deb8db7 71a3aa0349c5 |
children | 54394d2aaf5e 3c7f98753e37 |
comparison
equal
deleted
inserted
replaced
1462:5dfb18b98a55 | 1470:c3f6e97c71b1 |
---|---|
478 | 478 |
479 aliases: squash | 479 aliases: squash |
480 | 480 |
481 fold multiple revisions into a single one | 481 fold multiple revisions into a single one |
482 | 482 |
483 Folds a set of revisions with the parent of the working directory. All | 483 By default, folds all the revisions linearly between the given revisions |
484 revisions linearly between the given revisions and the parent of the | 484 and the parent of the working directory. |
485 working directory will also be folded. | |
486 | 485 |
487 Use --exact for folding only the specified revisions while ignoring the | 486 Use --exact for folding only the specified revisions while ignoring the |
488 parent of the working directory. In this case, the given revisions must | 487 parent of the working directory. In this case, the given revisions must |
489 form a linear unbroken chain. | 488 form a linear unbroken chain. |
490 | 489 |