4 commits

Author	SHA1	Message	Date
Matt Bierner	52d3961c2b	Update more extensions to use shared config	2018-10-02 10:24:19 -07:00
Matt Bierner	7ac8e49eb0	Add additional no unused checks for merge-conflict extension	2017-11-07 11:22:08 -08:00
Matt Bierner	cd00b590a8	Enable strict in a few more extensions	2017-11-06 11:40:05 -08:00
Phil Price	61f16319ab	Initial merge of 'better-merge' extension into core extensions. ... - 'better-merge' command and setting namespace replaced with 'merge-conflict' - Configuration settings from extension replaced with single 'merge-conflicts.enabled' : boolean setting	2017-05-22 13:56:18 -07:00