Mercurial > hg-stable
changeset 18157:52581d2b98ac stable
tests: fix windows test failures
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 28 Dec 2012 14:10:35 +0100 |
| parents | a907826c158c |
| children | 974119c4df2b e4f17956f45a |
| files | tests/test-diff-color.t tests/test-rebase-pull.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-diff-color.t Thu Dec 13 19:19:06 2012 +0100 +++ b/tests/test-diff-color.t Fri Dec 28 14:10:35 2012 +0100 @@ -152,7 +152,7 @@ c c \x1b[0;32m+aa\x1b[0m (esc) - \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc) + \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (glob) (esc) \x1b[0;31;1m--- a/sub/b\x1b[0m (esc) \x1b[0;32;1m+++ b/sub/b\x1b[0m (esc) \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
--- a/tests/test-rebase-pull.t Thu Dec 13 19:19:06 2012 +0100 +++ b/tests/test-rebase-pull.t Fri Dec 28 14:10:35 2012 +0100 @@ -144,7 +144,7 @@ adding L1 created new head $ hg pull --rev tip --rebase - pulling from $TESTTMP/a + pulling from $TESTTMP/a (glob) searching for changes adding changesets adding manifests