diff tests/test-rebase-conflicts.out @ 7278:45495d784ad6

rebase: avoid redundant merges (issue1301)

--- a/tests/test-rebase-conflicts.out	Mon Oct 06 14:41:22 2008 +0200
+++ b/tests/test-rebase-conflicts.out	Tue Sep 16 17:51:14 2008 +0200
@@ -1,6 +1,8 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
-@  4: L2
+@  5: L3
+|
+o  4: L2
 |
 o  3: L1
 |
@@ -29,9 +31,11 @@
 adding changesets
 adding manifests
 adding file changes
-added 2 changesets with 2 changes to 2 files
+added 3 changesets with 3 changes to 3 files
 rebase completed
-@  4: L2
+@  5: L3
+|
+o  4: L2
 |
 o  3: L1
 |
@@ -41,3 +45,22 @@
 |
 o  0: C1
 
+
+% Check correctness
+  - Rev. 0
+c1
+  - Rev. 1
+c1
+c2
+  - Rev. 2
+c1
+c2
+c3
+  - Rev. 3
+c1
+c2
+c3
+  - Rev. 4
+resolved merge
+  - Rev. 5
+resolved merge