Sign in
googlers
/
jrn
/
git
/
af6a51875a44c0bd16a21329456aadde615a2f46
/
t
/
t6428-merge-conflicts-sparse.sh
af6a518
repo_read_index: clear SKIP_WORKTREE bit from files present in worktree
by Elijah Newren
· 3 years, 3 months ago
66b209b
merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
by Elijah Newren
· 4 years ago
8ddc20b
t6428: new test for SKIP_WORKTREE handling and conflicts
by Elijah Newren
· 4 years ago
