merge with stable
authorMads Kiilerich <madski@unity3d.com>
Fri, 28 Dec 2012 14:13:06 +0100
changeset 18158 974119c4df2b
parent 18156 0e68a3c11295 (current diff)
parent 18157 52581d2b98ac (diff)
child 18159 8019f96ec4ce
merge with stable
--- 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)