diff options
Diffstat (limited to 't/t1015-read-index-unmerged.sh')
| -rwxr-xr-x | t/t1015-read-index-unmerged.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t1015-read-index-unmerged.sh b/t/t1015-read-index-unmerged.sh index 55d22da32c..9b965d0294 100755 --- a/t/t1015-read-index-unmerged.sh +++ b/t/t1015-read-index-unmerged.sh @@ -1,6 +1,7 @@ #!/bin/sh test_description='Test various callers of read_index_unmerged' + . ./test-lib.sh test_expect_success 'setup modify/delete + directory/file conflict' ' |