| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstr | Edward Thomson | 2021-10-17 | 1 | -4/+4 |
| * | Convert usage of `git_buf_free` to new `git_buf_dispose` | Patrick Steinhardt | 2018-06-10 | 1 | -2/+2 |
| * | merge: reverse merge bases for recursive merge | Edward Thomson | 2018-02-04 | 1 | -5/+5 |
| * | merge: recursive uses larger conflict markers | Edward Thomson | 2018-01-21 | 1 | -2/+2 |
| * | merge: handle conflicts in recursive base building | Edward Thomson | 2015-11-25 | 1 | -1/+34 |
| * | recursive: test conflict output during recursive merge | Edward Thomson | 2015-11-25 | 1 | -0/+51 |
