--- multifile2.in.tmp+++ multifile2.out@@ -1,21 +1,19 @@-77777 77778 77779 77780 77781 77782-77783-77784-77785-77786-77787-77788 77789+77788+77787+77786+77785+77784+77783 77790 77791 77792 77793 77794-77795 77796 77797 of course, each patch can have its own commentlines mixed in, so we should handle these.--- multifile1.in.tmp+++ multifile1.out@@ -14,16 +14,6 @@ 12 17 18-19-20-21-22-23-24-25-26-27-28 29 30 31@@ -32,20 +22,6 @@ 34 35 36-37-38-39-42-43-44-45-46-47-48-49-50-51-52 53 54 55@@ -73,11 +49,11 @@ 77 78 79-80-81-82-83 84+83+82+81+80 85 86 88
--- multifile2.in.tmp
+++ multifile2.out
@@ -1,21 +1,19 @@
-77777
77778
77779
77780
77781
77782
-77783
-77784
-77785
-77786
-77787
-77788
77789
+77788
+77787
+77786
+77785
+77784
+77783
77790
77791
77792
77793
77794
-77795
77796
77797
of course, each patch can have its own comment
lines mixed in, so we should handle these.
--- multifile1.in.tmp
+++ multifile1.out
@@ -14,16 +14,6 @@
12
17
18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
29
30
31
@@ -32,20 +22,6 @@
34
35
36
-37
-38
-39
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
53
54
55
@@ -73,11 +49,11 @@
77
78
79
-80
-81
-82
-83
84
+83
+82
+81
+80
85
86
88