diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-02 02:23:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 23:38:47 +0200 |
| commit | f2deabfcb66fdf0fd311a28f6de6704be56b6935 (patch) | |
| tree | de79959af7a406b680fd9034d3e078470f1dc8e1 /t/t1020-subdirectory.sh | |
| parent | t0000-t0999: fix broken &&-chains (diff) | |
| download | git-f2deabfcb66fdf0fd311a28f6de6704be56b6935.tar.xz git-f2deabfcb66fdf0fd311a28f6de6704be56b6935.zip | |
t1000-t1999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1020-subdirectory.sh')
| -rwxr-xr-x | t/t1020-subdirectory.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index df3183ea1a..c2df75e495 100755 --- a/t/t1020-subdirectory.sh +++ b/t/t1020-subdirectory.sh @@ -148,7 +148,7 @@ test_expect_success 'GIT_PREFIX for built-ins' ' ( cd dir && echo "change" >two && - GIT_EXTERNAL_DIFF=./diff git diff >../actual + GIT_EXTERNAL_DIFF=./diff git diff >../actual && git checkout -- two ) && test_cmp expect actual |