Merge branch 'bg/maint-remote-update-default' into maint

[git.git] / t / t4034-diff-words.sh

diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 2d24fbeda67772e0dd5e3331d74b0befabff272c..1c21276c55400c594f71bc01eba17b0d3820b420 100755 (executable)
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -8,6 +8,7 @@ test_expect_success setup '
 
        git config diff.color.old red
        git config diff.color.new green
+       git config diff.color.func magenta
 
 '
 
@@ -16,6 +17,7 @@ decrypt_color () {
                -e 's/.\[1m/<WHITE>/g' \
                -e 's/.\[31m/<RED>/g' \
                -e 's/.\[32m/<GREEN>/g' \
+               -e 's/.\[35m/<MAGENTA>/g' \
                -e 's/.\[36m/<BROWN>/g' \
                -e 's/.\[m/<RESET>/g'
 }
@@ -70,7 +72,7 @@ cat > expect <<\EOF
 <WHITE>+++ b/post<RESET>
 <BROWN>@@ -1 +1 @@<RESET>
 <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
-<BROWN>@@ -3,0 +4,4 @@ a = b + c<RESET>
+<BROWN>@@ -3,0 +4,4 @@<RESET> <RESET><MAGENTA>a = b + c<RESET>
 
 <GREEN>aa = a<RESET>