equal
deleted
inserted
replaced
32 @@ -0,0 +1,1 @@ |
32 @@ -0,0 +1,1 @@ |
33 +123 |
33 +123 |
34 |
34 |
35 $ hg diff -r "" |
35 $ hg diff -r "" |
36 hg: parse error: empty query |
36 hg: parse error: empty query |
37 [255] |
37 [10] |
38 $ hg diff -r tip -r "" |
38 $ hg diff -r tip -r "" |
39 hg: parse error: empty query |
39 hg: parse error: empty query |
40 [255] |
40 [10] |
41 |
41 |
42 Remove a file that was added via merge. Since the file is not in parent 1, |
42 Remove a file that was added via merge. Since the file is not in parent 1, |
43 it should not be in the diff. |
43 it should not be in the diff. |
44 |
44 |
45 $ hg ci -m 'a=foo' a |
45 $ hg ci -m 'a=foo' a |