diff options
Diffstat (limited to 't/t6428-merge-conflicts-sparse.sh')
| -rwxr-xr-x | t/t6428-merge-conflicts-sparse.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh index 9919c3fa7c..c86e02c6e2 100755 --- a/t/t6428-merge-conflicts-sparse.sh +++ b/t/t6428-merge-conflicts-sparse.sh @@ -23,8 +23,6 @@ test_description="merge cases" # files that might be renamed into each other's paths.) . ./test-lib.sh -. "$TEST_DIRECTORY"/lib-merge.sh - # Testcase basic, conflicting changes in 'numerals' |