Mercurial > public > mercurial-scm > hg-stable
diff tests/test-rebase-parameters.out @ 7999:b25110140573
rebase: word-wrap help texts at 70 characters
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Sat, 04 Apr 2009 23:19:11 +0200 |
| parents | 4d9e8efb7326 |
| children | 813a02a4eda2 |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.out Sat Apr 04 23:18:51 2009 +0200 +++ b/tests/test-rebase-parameters.out Sat Apr 04 23:19:11 2009 +0200 @@ -6,12 +6,12 @@ move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of history - onto another. This can be useful for linearizing local changes relative to - a master development tree. + Rebase uses repeated merging to graft changesets from one part of + history onto another. This can be useful for linearizing local + changes relative to a master development tree. - If a rebase is interrupted to manually resolve a merge, it can be continued - with --continue or aborted with --abort. + If a rebase is interrupted to manually resolve a merge, it can be + continued with --continue or aborted with --abort. options: @@ -34,12 +34,12 @@ move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of history - onto another. This can be useful for linearizing local changes relative to - a master development tree. + Rebase uses repeated merging to graft changesets from one part of + history onto another. This can be useful for linearizing local + changes relative to a master development tree. - If a rebase is interrupted to manually resolve a merge, it can be continued - with --continue or aborted with --abort. + If a rebase is interrupted to manually resolve a merge, it can be + continued with --continue or aborted with --abort. options: @@ -62,12 +62,12 @@ move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of history - onto another. This can be useful for linearizing local changes relative to - a master development tree. + Rebase uses repeated merging to graft changesets from one part of + history onto another. This can be useful for linearizing local + changes relative to a master development tree. - If a rebase is interrupted to manually resolve a merge, it can be continued - with --continue or aborted with --abort. + If a rebase is interrupted to manually resolve a merge, it can be + continued with --continue or aborted with --abort. options: @@ -90,12 +90,12 @@ move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of history - onto another. This can be useful for linearizing local changes relative to - a master development tree. + Rebase uses repeated merging to graft changesets from one part of + history onto another. This can be useful for linearizing local + changes relative to a master development tree. - If a rebase is interrupted to manually resolve a merge, it can be continued - with --continue or aborted with --abort. + If a rebase is interrupted to manually resolve a merge, it can be + continued with --continue or aborted with --abort. options: