From 2e1d237b6fb744520b79cb03dde564877303f568 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 17 Feb 2009 16:26:23 -0800 Subject: [PATCH] Correct grammar in the patch conflict messages Signed-off-by: Shawn O. Pearce --- src/main/java/com/google/gerrit/git/MergeOp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/gerrit/git/MergeOp.java b/src/main/java/com/google/gerrit/git/MergeOp.java index ae9c7832ee..bde95936c1 100644 --- a/src/main/java/com/google/gerrit/git/MergeOp.java +++ b/src/main/java/com/google/gerrit/git/MergeOp.java @@ -407,7 +407,7 @@ public class MergeOp { case PATH_CONFLICT: { final String txt = - "Your change could not been merged due to a path conflict.\n" + "Your change could not be merged due to a path conflict.\n" + "\n" + "Please merge (or rebase) the change locally and upload the resolution for review."; setNew(c, message(c, txt));