diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-11 14:52:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-11 14:52:23 +0900 |
| commit | 97cb362262c27ab952ac2ee3109eb9411ad3d11b (patch) | |
| tree | 61f01ce5471338c4fb86225a1037187b61725f6a /t/t4015-diff-whitespace.sh | |
| parent | bab02c6e63958fca62e197053f41affcd50bb00a (diff) | |
| parent | 9c5b2fab304b5ce3233401c7c7e7a123d551c484 (diff) | |
| download | git-97cb362262c27ab952ac2ee3109eb9411ad3d11b.tar.gz git-97cb362262c27ab952ac2ee3109eb9411ad3d11b.tar.xz | |
Merge branch 'sb/test-cmp-expect-actual'
Test tweak.
* sb/test-cmp-expect-actual:
tests: fix diff order arguments in test_cmp
Diffstat (limited to 't/t4015-diff-whitespace.sh')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 3bca95886..bd0f75d9f 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -155,7 +155,7 @@ test_expect_success 'ignore-blank-lines: only new lines' ' " >x && git diff --ignore-blank-lines >out && >expect && - test_cmp out expect + test_cmp expect out ' test_expect_success 'ignore-blank-lines: only new lines with space' ' @@ -165,7 +165,7 @@ test_expect_success 'ignore-blank-lines: only new lines with space' ' " >x && git diff -w --ignore-blank-lines >out && >expect && - test_cmp out expect + test_cmp expect out ' test_expect_success 'ignore-blank-lines: after change' ' |