summaryrefslogtreecommitdiff
path: root/t/t6428-merge-conflicts-sparse.sh
AgeCommit message (Expand)Author
2022-04-22tests: stop assuming --no-cone is the default mode for sparse-checkoutElijah Newren
2022-01-14repo_read_index: clear SKIP_WORKTREE bit from files present in worktreeElijah Newren
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren
2021-03-20t6428: new test for SKIP_WORKTREE handling and conflictsElijah Newren