4 Commits

Author	SHA1	Message	Date
Siddharth Agarwal	ebe6a3b2a1	mergedriver: add an option to resolve to skip merge driver ... Sometimes the merge driver might be malfunctioning -- it is important to have a way to skip it so that this can be resolved later.	2015-12-02 22:58:57 -08:00
Siddharth Agarwal	f07f8b307a	mergedriver: don't abort on changed merge driver ... We want to retain the flexibility of being able to disable the merge driver if stuff breaks disastrously.	2015-12-02 16:09:14 -08:00
Siddharth Agarwal	3156dfe5a3	mergedriver: ignore failures where the file wasn't found	2015-12-02 14:20:51 -08:00
Siddharth Agarwal	e49d9a23dc	initial mergedriver implementation	2015-10-15 00:37:45 -07:00