GitHub repository: philippotto/ConflictFormatter
Primary language: JavaScript
Created: 2017-01-05T15:26:55Z
Description: Format a diff3-style merge conflict by showing its underlying changes separately.