opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.9' into stable-2.10

Browse Source 
* stable-2.9:
  Minor updates in 2.9 release notes
  RebaseChange: Fix typo

Change-Id: If3d6656f1b31b718322d1a322bad93a98a93d256
This commit is contained in:
David Pursehouse
2014-07-23 12:03:36 +09:00
parent 29ca6ac149 70b4f8f703
commit 536f7e6bd6
2 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
View File

@@ -185,7 +185,7 @@ public class RebaseChange {
if (patchSetAncestors.size() > 1) {
throw new IOException(
"Cannot rebase a change with multiple parents. Parents commits: "
"Cannot rebase a change with multiple parents. Parent commits: "
+ patchSetAncestors.toString());
}
if (patchSetAncestors.size() == 0) {