2 commits

Author	SHA1	Message	Date
Phil Price	83fd45c45d	Command titles and category localization support	2017-05-22 14:04:51 -07: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