-
由 Phil Price 提交于
- 'better-merge' command and setting namespace replaced with 'merge-conflict' - Configuration settings from extension replaced with single 'merge-conflicts.enabled' : boolean setting
61f16319
Analyzing file…
- 'better-merge' command and setting namespace replaced with 'merge-conflict' - Configuration settings from extension replaced with single 'merge-conflicts.enabled' : boolean setting