Make merge failure error messages consistent

Change-Id: I9f33fc629587e7b03863d7b3a1f6ed8051d9e56d
2015-01-15 15:50:49 +09:00
parent e4e8315cc6
commit 6d3411fe3f
2 changed files with 3 additions and 3 deletions
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -452,7 +452,7 @@ public class MergeOp {
        for (ChangeData cd : queryProvider.get().submitted(destBranch)) {
          try {
            Change c = cd.change();
-            setNew(c, message(c, "Your change could not be merged, "
+            setNew(c, message(c, "Change could not be merged, "
                + "because the destination branch does not exist anymore."));
          } catch (OrmException e) {
            log.error("Error setting change new", e);