Age | Commit message (Expand) | Author |
---|---|---|
2016-03-17 | merge drivers: handle configured but not found driver | Edward Thomson |
2016-03-17 | merge driver: remove `check` callback | Edward Thomson |
2016-03-17 | merge driver: tests for set and unset merge attribute | Edward Thomson |
2016-03-17 | merge driver: tests for custom default merge drivers | Edward Thomson |
2016-03-17 | merge driver: test GIT_EMERGECONFLICT | Edward Thomson |
2016-03-17 | merge driver: test GIT_PASSTHROUGH | Edward Thomson |
2016-03-17 | merge driver: introduce custom merge drivers | Edward Thomson |