equal
deleted
inserted
replaced
156 @@ -1,3 +1,3 @@ |
156 @@ -1,3 +1,3 @@ |
157 1 |
157 1 |
158 -2 |
158 -2 |
159 +2 2 |
159 +2 2 |
160 3 |
160 3 |
161 record change 1/6 to '1.txt'? [Ynsfdaq?] |
161 record change 1/4 to '1.txt'? [Ynsfdaq?] |
162 @@ -3,3 +3,3 @@ |
162 @@ -3,3 +3,3 @@ |
163 3 |
163 3 |
164 -4 |
164 -4 |
165 +4 4 |
165 +4 4 |
166 5 |
166 5 |
167 record change 2/6 to '1.txt'? [Ynsfdaq?] |
167 record change 2/4 to '1.txt'? [Ynsfdaq?] |
168 diff --git a/2.txt b/2.txt |
168 diff --git a/2.txt b/2.txt |
169 1 hunks, 1 lines changed |
169 1 hunks, 1 lines changed |
170 examine changes to '2.txt'? [Ynsfdaq?] |
170 examine changes to '2.txt'? [Ynsfdaq?] |
171 @@ -1,5 +1,5 @@ |
171 @@ -1,5 +1,5 @@ |
172 a |
172 a |
173 -b |
173 -b |
174 +b b |
174 +b b |
175 c |
175 c |
176 d |
176 d |
177 e |
177 e |
178 record change 4/6 to '2.txt'? [Ynsfdaq?] |
178 record change 3/4 to '2.txt'? [Ynsfdaq?] |
179 diff --git a/dir/a.txt b/dir/a.txt |
179 diff --git a/dir/a.txt b/dir/a.txt |
180 1 hunks, 1 lines changed |
180 1 hunks, 1 lines changed |
181 examine changes to 'dir/a.txt'? [Ynsfdaq?] |
181 examine changes to 'dir/a.txt'? [Ynsfdaq?] |
182 |
182 |
183 After qrecord a.patch 'tip'" |
183 After qrecord a.patch 'tip'" |
253 2 2 |
253 2 2 |
254 3 |
254 3 |
255 -4 |
255 -4 |
256 +4 4 |
256 +4 4 |
257 5 |
257 5 |
258 record change 1/3 to '1.txt'? [Ynsfdaq?] |
258 record change 1/2 to '1.txt'? [Ynsfdaq?] |
259 diff --git a/dir/a.txt b/dir/a.txt |
259 diff --git a/dir/a.txt b/dir/a.txt |
260 1 hunks, 1 lines changed |
260 1 hunks, 1 lines changed |
261 examine changes to 'dir/a.txt'? [Ynsfdaq?] |
261 examine changes to 'dir/a.txt'? [Ynsfdaq?] |
262 @@ -1,4 +1,4 @@ |
262 @@ -1,4 +1,4 @@ |
263 -hello world |
263 -hello world |
264 +hello world! |
264 +hello world! |
265 |
265 |
266 someone |
266 someone |
267 up |
267 up |
268 record change 3/3 to 'dir/a.txt'? [Ynsfdaq?] |
268 record change 2/2 to 'dir/a.txt'? [Ynsfdaq?] |
269 |
269 |
270 After qrecord b.patch 'tip' |
270 After qrecord b.patch 'tip' |
271 |
271 |
272 $ hg tip -p |
272 $ hg tip -p |
273 changeset: 2:b056198bf878 |
273 changeset: 2:b056198bf878 |