equal
deleted
inserted
replaced
73 |
73 |
74 % diff across many revisions |
74 % diff across many revisions |
75 diff --git a/dst2 b/dst3 |
75 diff --git a/dst2 b/dst3 |
76 rename from dst2 |
76 rename from dst2 |
77 rename to dst3 |
77 rename to dst3 |
|
78 % reversed |
|
79 diff --git a/dst3 b/dst2 |
|
80 rename from dst3 |
|
81 rename to dst2 |
78 |
82 |
79 % file created before r1 and renamed before r2 |
83 % file created before r1 and renamed before r2 |
80 diff --git a/foo b/bar |
84 diff --git a/foo b/bar |
81 rename from foo |
85 rename from foo |
82 rename to bar |
86 rename to bar |
84 +++ b/bar |
88 +++ b/bar |
85 @@ -1,2 +1,3 @@ a |
89 @@ -1,2 +1,3 @@ a |
86 a |
90 a |
87 b |
91 b |
88 +c |
92 +c |
|
93 % reversed |
|
94 diff --git a/bar b/foo |
|
95 rename from bar |
|
96 rename to foo |
|
97 --- a/foo |
|
98 +++ b/foo |
|
99 @@ -1,3 +1,2 @@ a |
|
100 a |
|
101 b |
|
102 -c |
89 |
103 |
90 % file created in r1 and renamed before r2 |
104 % file created in r1 and renamed before r2 |
91 diff --git a/foo b/bar |
105 diff --git a/foo b/bar |
92 rename from foo |
106 rename from foo |
93 rename to bar |
107 rename to bar |
95 +++ b/bar |
109 +++ b/bar |
96 @@ -1,1 +1,3 @@ a |
110 @@ -1,1 +1,3 @@ a |
97 a |
111 a |
98 +b |
112 +b |
99 +c |
113 +c |
|
114 % reversed |
|
115 diff --git a/bar b/foo |
|
116 rename from bar |
|
117 rename to foo |
|
118 --- a/foo |
|
119 +++ b/foo |
|
120 @@ -1,3 +1,1 @@ a |
|
121 a |
|
122 -b |
|
123 -c |
100 |
124 |
101 % file created after r1 and renamed before r2 |
125 % file created after r1 and renamed before r2 |
102 diff --git a/bar b/bar |
126 diff --git a/bar b/bar |
103 new file mode 100644 |
127 new file mode 100644 |
104 --- /dev/null |
128 --- /dev/null |
105 +++ b/bar |
129 +++ b/bar |
106 @@ -0,0 +1,3 @@ |
130 @@ -0,0 +1,3 @@ |
107 +a |
131 +a |
108 +b |
132 +b |
109 +c |
133 +c |
|
134 % reversed |
|
135 diff --git a/bar b/bar |
|
136 deleted file mode 100644 |
|
137 --- a/bar |
|
138 +++ /dev/null |
|
139 @@ -1,3 +0,0 @@ |
|
140 -a |
|
141 -b |
|
142 -c |
110 |
143 |
111 % comparing with the working dir |
144 % comparing with the working dir |
112 % there's a copy in the working dir... |
145 % there's a copy in the working dir... |
113 diff --git a/created2 b/created3 |
146 diff --git a/created2 b/created3 |
114 rename from created2 |
147 rename from created2 |
143 rename from brand-new2 |
176 rename from brand-new2 |
144 rename to brand-new3 |
177 rename to brand-new3 |
145 diff --git a/brand-new2 b/brand-new3-2 |
178 diff --git a/brand-new2 b/brand-new3-2 |
146 copy from brand-new2 |
179 copy from brand-new2 |
147 copy to brand-new3-2 |
180 copy to brand-new3-2 |
|
181 % reversed |
|
182 diff --git a/brand-new3 b/brand-new2 |
|
183 rename from brand-new3 |
|
184 rename to brand-new2 |
|
185 diff --git a/brand-new3-2 b/brand-new3-2 |
|
186 deleted file mode 100644 |
|
187 --- a/brand-new3-2 |
|
188 +++ /dev/null |
|
189 @@ -1,1 +0,0 @@ |
|
190 - |
148 % there should be a trailing TAB if there are spaces in the file name |
191 % there should be a trailing TAB if there are spaces in the file name |
149 diff --git a/with spaces b/with spaces |
192 diff --git a/with spaces b/with spaces |
150 new file mode 100644 |
193 new file mode 100644 |
151 --- /dev/null |
194 --- /dev/null |
152 +++ b/with spaces |
195 +++ b/with spaces |