Mercurial > hg
changeset 18158:974119c4df2b
merge with stable
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 28 Dec 2012 14:13:06 +0100 |
| parents | 0e68a3c11295 (current diff) 52581d2b98ac (diff) |
| children | 8019f96ec4ce |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 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:13:06 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)