Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge_driver: fix missing `goto done;` | Patrick Steinhardt | 2016-04-01 | 1 | -0/+1 |
* | merge driver: remove `check` callback | Edward Thomson | 2016-03-17 | 1 | -91/+30 |
* | merge driver: correct global initialization | Edward Thomson | 2016-03-17 | 1 | -63/+113 |
* | merge driver: get a pointer to favor | Edward Thomson | 2016-03-17 | 1 | -3/+8 |
* | merge driver: correct indentation | Edward Thomson | 2016-03-17 | 1 | -17/+17 |
* | merge driver: allow custom default driver | Edward Thomson | 2016-03-17 | 1 | -36/+35 |
* | merge driver: introduce custom merge drivers | Edward Thomson | 2016-03-17 | 1 | -0/+403 |