Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | read-cache: fix directory/file conflict handling in read_index_unmerged() | Elijah Newren | 2018-07-31 | 1 | -4/+4 |
* | t1015: demonstrate directory/file conflict recovery failures | Elijah Newren | 2018-07-31 | 1 | -0/+123 |