three-way-merge (npm): Library for performing three-way diffs and merges
Keywords: ember-addon