opendev/gerrit
Code Issues Proposed changes

Correct grammar in the patch conflict messages

Browse Source 
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-02-17 16:26:23 -08:00
parent aaa715f18c
commit 2e1d237b6f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/google/gerrit/git/MergeOp.java
View File

@@ -407,7 +407,7 @@ public class MergeOp {
case PATH_CONFLICT: { case PATH_CONFLICT: {
final String txt = 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" + "\n"
+ "Please merge (or rebase) the change locally and upload the resolution for review."; + "Please merge (or rebase) the change locally and upload the resolution for review.";
setNew(c, message(c, txt)); setNew(c, message(c, txt));