On Sat, Jul 18, 2015 at 4:24 AM, Philip Oakley <philipoakley@xxxxxxx> wrote: > From: "Junio C Hamano" <gitster@xxxxxxxxx> >> As the nature of the conflict marker line determies if there should > > "should be a"? > i.e. s/a /be a / below Also: s/determies/determines/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html