smashwilson/merge-conflicts — pull request #55 by smashwilson (2014-05-25 16:18:46+00:00)
Title: Add-add conflicts

As reported in #50, add-add conflicts are resolved just like both-modified ones, but I'm currently only detecting both-modified.

This handles add-add conflicts and makes a few changes in support of #10.