summaryrefslogtreecommitdiff
path: root/t/t6428-merge-conflicts-sparse.sh
AgeCommit message (Expand)AuthorFilesLines
2022-01-14repo_read_index: clear SKIP_WORKTREE bit from files present in worktreeLibravatar Elijah Newren1-18/+5
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesLibravatar Elijah Newren1-2/+2
2021-03-20t6428: new test for SKIP_WORKTREE handling and conflictsLibravatar Elijah Newren1-0/+158