diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:34:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:34:45 -0800 |
| commit | b918eb6c2a949282a223bdb04ec8a524003f8c0c (patch) | |
| tree | b5a3197f569ea3b42ada2e149e21fcf7b8740ef2 /t | |
| parent | e160da7f60e67ee548472d907ede3291bbc2a79e (diff) | |
| parent | 89cb73a19ac94d15babf77af490fa5db78908234 (diff) | |
| download | git-b918eb6c2a949282a223bdb04ec8a524003f8c0c.tar.gz git-b918eb6c2a949282a223bdb04ec8a524003f8c0c.tar.xz | |
Merge branch 'bw/diff-color-hunk-header'
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4034-diff-words.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh index 21db6e95c..1c21276c5 100755 --- 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' } @@ -49,7 +51,7 @@ cat > expect <<\EOF <WHITE>+++ b/post<RESET> <BROWN>@@ -1,3 +1,7 @@<RESET> <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET> -<RESET> + a = b + c<RESET> <GREEN>aa = a<RESET> @@ -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> @@ -90,7 +92,7 @@ cat > expect <<\EOF <WHITE>+++ b/post<RESET> <BROWN>@@ -1,3 +1,7 @@<RESET> h(4),<GREEN>hh<RESET>[44] -<RESET> + a = b + c<RESET> <GREEN>aa = a<RESET> @@ -126,7 +128,7 @@ cat > expect <<\EOF <WHITE>+++ b/post<RESET> <BROWN>@@ -1,3 +1,7 @@<RESET> h(4)<GREEN>,hh[44]<RESET> -<RESET> + a = b + c<RESET> <GREEN>aa = a<RESET> @@ -168,7 +170,7 @@ cat > expect <<\EOF <WHITE>+++ b/post<RESET> <BROWN>@@ -1,3 +1,7 @@<RESET> h(4),<GREEN>hh[44<RESET>] -<RESET> + a = b + c<RESET> <GREEN>aa = a<RESET> |