Git Merge Conflict Resolver

Paste your conflicting files, see a visual diff of 'Mine' (HEAD) vs. 'Theirs' (Incoming), and edit the final resolved output.