Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Collect merge-related tests to t64xx | Elijah Newren | 2020-08-10 | 1 | -23/+0 |
* | merge-recursive: make "CONFLICT (rename/delete)" message show both pathsmm/merge-rename-delete-message | Matt McCutchen | 2017-01-30 | 1 | -0/+23 |