Commit fccad82ee8f431e06097b3a1282228b40ae7128f

Edward Thomson 2015-10-27T14:23:35

merge: add recursive test with three merge bases