libgit2/libgit2 — pull request #1220 by ethomson (2013-01-10 17:56:49+00:00)
Title: REUC needs to handle empty sides

The REUC needs to handle empty sides - eg, if there's no ancestor (from add/add conflicts for example.)