--- a/tests/test-rebase-parameters.out Tue Jul 07 23:54:42 2009 +0200
+++ b/tests/test-rebase-parameters.out Tue Jul 07 23:54:42 2009 +0200
@@ -6,9 +6,9 @@
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/-c or aborted with --abort/-a.
@@ -34,9 +34,9 @@
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/-c or aborted with --abort/-a.
@@ -62,9 +62,9 @@
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/-c or aborted with --abort/-a.
@@ -90,9 +90,9 @@
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/-c or aborted with --abort/-a.