merge-recursive: add/add really is modify/modify with an empty base