changeset 45895 | fc4fb2f17dd4 |
parent 27902 | 51b6ce257e0a |
--- a/tests/test-diffdir.t Fri Nov 20 14:43:21 2020 -0800 +++ b/tests/test-diffdir.t Mon Nov 16 16:00:50 2020 -0800 @@ -34,10 +34,10 @@ $ hg diff -r "" hg: parse error: empty query - [255] + [10] $ hg diff -r tip -r "" hg: parse error: empty query - [255] + [10] Remove a file that was added via merge. Since the file is not in parent 1, it should not be in the diff.