Correct grammar in the patch conflict messages

Signed-off-by: Shawn O. Pearce <sop@google.com>
1 file changed