equal
deleted
inserted
replaced
195 10 |
195 10 |
196 |
196 |
197 merge diff should show only manual edits to a merge: |
197 merge diff should show only manual edits to a merge: |
198 |
198 |
199 $ hg diff --merge -c 6 |
199 $ hg diff --merge -c 6 |
200 merging file.txt |
|
201 (no diff output is expected here) |
200 (no diff output is expected here) |
202 |
201 |
203 Construct an "evil merge" that does something other than just the merge. |
202 Construct an "evil merge" that does something other than just the merge. |
204 |
203 |
205 $ hg co ".^" |
204 $ hg co ".^" |
226 +11 |
225 +11 |
227 Contrast with the `hg diff -c 7` version above: only the manual edit shows |
226 Contrast with the `hg diff -c 7` version above: only the manual edit shows |
228 up, making it easy to identify changes someone is otherwise trying to sneak |
227 up, making it easy to identify changes someone is otherwise trying to sneak |
229 into a merge. |
228 into a merge. |
230 $ hg diff --merge -c 7 |
229 $ hg diff --merge -c 7 |
231 merging file.txt |
|
232 diff -r 8ad85e839ba7 file.txt |
230 diff -r 8ad85e839ba7 file.txt |
233 --- a/file.txt Thu Jan 01 00:00:00 1970 +0000 |
231 --- a/file.txt Thu Jan 01 00:00:00 1970 +0000 |
234 +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 |
232 +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 |
235 @@ -9,3 +9,4 @@ |
233 @@ -9,3 +9,4 @@ |
236 y |
234 y |
275 +++ b/new-file-p2.txt Thu Jan 01 00:00:00 1970 +0000 |
273 +++ b/new-file-p2.txt Thu Jan 01 00:00:00 1970 +0000 |
276 @@ -0,0 +1,1 @@ |
274 @@ -0,0 +1,1 @@ |
277 +this file is new in p2 of the merge |
275 +this file is new in p2 of the merge |
278 With --merge, it's a diff against the conflicted content. |
276 With --merge, it's a diff against the conflicted content. |
279 $ hg diff --merge -c 11 |
277 $ hg diff --merge -c 11 |
280 merging file.txt |
|
281 diff -r 5010caab09f6 file.txt |
278 diff -r 5010caab09f6 file.txt |
282 --- a/file.txt Thu Jan 01 00:00:00 1970 +0000 |
279 --- a/file.txt Thu Jan 01 00:00:00 1970 +0000 |
283 +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 |
280 +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 |
284 @@ -6,12 +6,6 @@ |
281 @@ -6,12 +6,6 @@ |
285 5 |
282 5 |