|
|
@@ -99,7 +99,7 @@ test_expect_success 'changed commit' ' |
|
|
|
1: 4de457d = 1: a4b3333 s/5/A/ |
|
|
|
2: fccce22 = 2: f51d370 s/4/A/ |
|
|
|
3: 147e64e ! 3: 0559556 s/11/B/ |
|
|
|
@@ -10,7 +10,7 @@ |
|
|
|
@@ |
|
|
|
9 |
|
|
|
10 |
|
|
|
-11 |
|
|
@@ -109,7 +109,7 @@ test_expect_success 'changed commit' ' |
|
|
|
13 |
|
|
|
14 |
|
|
|
4: a63e992 ! 4: d966c5c s/12/B/ |
|
|
|
@@ -8,7 +8,7 @@ |
|
|
|
@@ |
|
|
|
@@ A |
|
|
|
9 |
|
|
|
10 |
|
|
@@ -158,7 +158,7 @@ test_expect_success 'changed commit with sm config' ' |
|
|
|
1: 4de457d = 1: a4b3333 s/5/A/ |
|
|
|
2: fccce22 = 2: f51d370 s/4/A/ |
|
|
|
3: 147e64e ! 3: 0559556 s/11/B/ |
|
|
|
@@ -10,7 +10,7 @@ |
|
|
|
@@ |
|
|
|
9 |
|
|
|
10 |
|
|
|
-11 |
|
|
@@ -168,7 +168,7 @@ test_expect_success 'changed commit with sm config' ' |
|
|
|
13 |
|
|
|
14 |
|
|
|
4: a63e992 ! 4: d966c5c s/12/B/ |
|
|
|
@@ -8,7 +8,7 @@ |
|
|
|
@@ |
|
|
|
@@ A |
|
|
|
9 |
|
|
|
10 |
|
|
@@ -191,7 +191,7 @@ test_expect_success 'changed message' ' |
|
|
|
sed s/Z/\ /g >expected <<-EOF && |
|
|
|
1: 4de457d = 1: f686024 s/5/A/ |
|
|
|
2: fccce22 ! 2: 4ab067d s/4/A/ |
|
|
|
@@ -2,6 +2,8 @@ |
|
|
|
@@ |
|
|
|
Z |
|
|
|
Z s/4/A/ |
|
|
|
Z |
|
|
@@ -210,7 +210,7 @@ test_expect_success 'dual-coloring' ' |
|
|
|
sed -e "s|^:||" >expect <<-\EOF && |
|
|
|
:<YELLOW>1: a4b3333 = 1: f686024 s/5/A/<RESET> |
|
|
|
:<RED>2: f51d370 <RESET><YELLOW>!<RESET><GREEN> 2: 4ab067d<RESET><YELLOW> s/4/A/<RESET> |
|
|
|
: <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET> |
|
|
|
: <REVERSE><CYAN>@@<RESET> |
|
|
|
: <RESET> |
|
|
|
: s/4/A/<RESET> |
|
|
|
: <RESET> |
|
|
@@ -220,7 +220,7 @@ test_expect_success 'dual-coloring' ' |
|
|
|
: --- a/file<RESET> |
|
|
|
: +++ b/file<RESET> |
|
|
|
:<RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET> |
|
|
|
: <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET> |
|
|
|
: <REVERSE><CYAN>@@<RESET> |
|
|
|
: 9<RESET> |
|
|
|
: 10<RESET> |
|
|
|
: <RED> -11<RESET> |
|
|
@@ -230,7 +230,7 @@ test_expect_success 'dual-coloring' ' |
|
|
|
: 13<RESET> |
|
|
|
: 14<RESET> |
|
|
|
:<RED>4: d966c5c <RESET><YELLOW>!<RESET><GREEN> 4: 8add5f1<RESET><YELLOW> s/12/B/<RESET> |
|
|
|
: <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET> |
|
|
|
: <REVERSE><CYAN>@@<RESET> |
|
|
|
: <CYAN> @@ A<RESET> |
|
|
|
: 9<RESET> |
|
|
|
: 10<RESET> |
|
|
|