aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6428-merge-conflicts-sparse.sh
AgeCommit message (Expand)AuthorFilesLines
2022-08-26t64xx: convert 'test_create_repo' to 'git init'Elijah Newren1-1/+1
2022-04-21tests: stop assuming --no-cone is the default mode for sparse-checkoutElijah Newren1-2/+2
2022-01-14repo_read_index: clear SKIP_WORKTREE bit from files present in worktreeElijah Newren1-18/+5
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren1-2/+2
2021-03-20t6428: new test for SKIP_WORKTREE handling and conflictsElijah Newren1-0/+158