---
t/lib-diff-alternative.sh | 4 ++--
t/t4029-diff-trailing-space.sh | 2 +-
t/t4034-diff-words.sh | 2 +-
t/t4051-diff-function-context.sh | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/lib-diff-alternative.sh b/t/lib-diff-alternative.sh
index 8b4dbf2..4a5d9d0 100644
--- a/t/lib-diff-alternative.sh
+++ b/t/lib-diff-alternative.sh
@@ -66,7 +66,7 @@ index 6faa5a3..e3af329 100644
+++ b/file2
@@ -1,26 +1,25 @@
#include <stdio.h>
-
+
+int fib(int n)
+{
+ if(n > 2)
@@ -86,7 +86,7 @@ index 6faa5a3..e3af329 100644
printf("%d\n", foo);
}
}
-
+
-int fact(int n)
-{
- if(n > 1)
diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh
index 3ccc237..751469c 100755
--- a/t/t4029-diff-trailing-space.sh
+++ b/t/t4029-diff-trailing-space.sh
@@ -27,7 +27,7 @@ test_expect_success \
git config --bool diff.suppressBlankEmpty true &&
git diff f > actual &&
test_cmp exp actual &&
- perl -i.bak -p -e "s/^\$/ /" exp &&
+ perl -i.bak -p -e "s/^\$//" exp &&
git config --bool diff.suppressBlankEmpty false &&
git diff f > actual &&
test_cmp exp actual &&
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index f2f55fc..7458e61 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -106,7 +106,7 @@ test_expect_success '--word-diff=porcelain' '
-h(4)
+h(4),hh[44]
~
- # significant space
+ # significant space
~
a = b + c
~
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index 001d678..f786139 100755
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -57,7 +57,7 @@ diff --git a/hello.c b/hello.c
{
- /* Classic. */
printf("Hello world.\n");
-
+
/* Success! */
return 0;
}
@@ -73,12 +73,12 @@ diff --git a/hello.c b/hello.c
--- a/hello.c
+++ b/hello.c
@@ -9,9 +9,8 @@ static int a(void)
-
+
static int hello_world(void)
{
- /* Classic. */
printf("Hello world.\n");
-
+
/* Success! */
return 0;
}
--
https://github.com/git/git/pull/245
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
