summaryrefslogtreecommitdiff
path: root/t/t6428-merge-conflicts-sparse.sh
Commit message (Expand)AuthorAgeFilesLines
* repo_read_index: clear SKIP_WORKTREE bit from files present in worktreeElijah Newren2022-01-141-18/+5
* merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren2021-03-201-2/+2
* t6428: new test for SKIP_WORKTREE handling and conflictsElijah Newren2021-03-201-0/+158