changeset 34146 | 9e4f82bc2b0b |
parent 30229 | 69ffbbe73dd0 |
child 49621 | 55c6ebd11cb9 |
--- a/tests/test-merge-local.t Tue Sep 12 19:27:01 2017 -0700 +++ b/tests/test-merge-local.t Mon Sep 11 17:49:49 2017 +0000 @@ -110,7 +110,7 @@ Are orig files from the last commit where we want them? $ ls .hg/origbackups - zzz2_merge_bad.orig + zzz2_merge_bad $ hg diff --nodates | grep "^[+-][^<>]" --- a/zzz1_merge_ok