Use extended SHA1 syntax in merge-recursive conflicts.