diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:22:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:22:59 -0800 |
| commit | 694a88a309c74ffeefa9a0db0396ee4c168a521c (patch) | |
| tree | 79007f8bcf98505df2e4cf423ac7307535c1b2d1 /t/t6031-merge-recursive.sh | |
| parent | Merge branch 'cn/thin-push-capability' (diff) | |
| parent | remove #!interpreter line from shell libraries (diff) | |
| download | tgif-694a88a309c74ffeefa9a0db0396ee4c168a521c.tar.xz | |
Merge branch 'jn/scripts-updates'
* jn/scripts-updates:
remove #!interpreter line from shell libraries
test: replace shebangs with descriptions in shell libraries
test: make FILEMODE a lazy prereq
contrib: remove git-p4import
mark contributed hooks executable
mark perl test scripts executable
mark Windows build scripts executable
Diffstat (limited to 't/t6031-merge-recursive.sh')
| -rwxr-xr-x | t/t6031-merge-recursive.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index 1cd649e245..a953f1b55c 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -2,7 +2,6 @@ test_description='merge-recursive: handle file mode' . ./test-lib.sh -. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh test_expect_success 'mode change in one branch: keep changed version' ' : >file1 && |