opendev/gerrit
Code Issues Proposed changes

Fix check mergeability documentation

Browse Source 
merge_strategy has been change to strategy in all other places.

Change-Id: I7b494d4adb294fffd5864cb25dc530ad7616db8b
This commit is contained in:
Zhen Chen
2016-08-03 23:29:43 -07:00
parent 76b0e76d2f
commit ec13e456ff
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/rest-api-changes.txt
View File

@@ -4844,7 +4844,7 @@ change.
Submit type used for this change, can be `MERGE_IF_NECESSARY`, Submit type used for this change, can be `MERGE_IF_NECESSARY`,
`FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`, `MERGE_ALWAYS` or `FAST_FORWARD_ONLY`, `REBASE_IF_NECESSARY`, `MERGE_ALWAYS` or
`CHERRY_PICK`. `CHERRY_PICK`.
|`merge_strategy` |optional| |`strategy` |optional|
The strategy of the merge, can be `recursive`, `resolve`, The strategy of the merge, can be `recursive`, `resolve`,
`simple-two-way-in-core`, `ours` or `theirs`. `simple-two-way-in-core`, `ours` or `theirs`.
|`mergeable` || |`mergeable` ||

2
Documentation/rest-api-projects.txt
View File

@@ -1385,7 +1385,7 @@ As response a link:#mergeable-info[MergeableInfo] entity is returned.
)]}' )]}'
{ {
submit_type: "MERGE_IF_NECESSARY", submit_type: "MERGE_IF_NECESSARY",
merge_strategy: "recursive", strategy: "recursive",
mergeable: true mergeable: true
} }
---- ----