Age | Commit message (Expand) | Author |
---|---|---|
2024-06-11 | merge-recursive: fix memory leak when finalizing merge | Patrick Steinhardt |
2018-07-31 | read-cache: fix directory/file conflict handling in read_index_unmerged() | Elijah Newren |
2018-07-31 | t1015: demonstrate directory/file conflict recovery failures | Elijah Newren |