kmx git

src/merge_driver.h

Author	Commit	Date	CI	Message
	6d8b2cdb	2016-02-28T09:34:11		merge driver: remove `check` callback Since the `apply` callback can defer, the `check` callback is not necessary. Removing the `check` callback further makes the `payload` unnecessary along with the `cleanup` callback.
	967e073d	2016-02-27T16:42:02		merge driver: correct global initialization