# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1356700386 -3600
# Node ID 974119c4df2bf0880bbe297a6aa2125c2b8607d5
# Parent  0e68a3c11295670f6b081ecfc0eb085510abf451# Parent  52581d2b98ac5355c3b2ea304595f8cfee4cce59
merge with stable

diff -r 0e68a3c11295 -r 974119c4df2b tests/test-diff-color.t
--- 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)