opendev/gerrit
Code Issues Proposed changes

Fix formatting in MergeInput documentation

Browse Source 
Change-Id: Idd61aea9640c7351a43c7ff963c5834c192d30a2
This commit is contained in:
David Pursehouse 2018-03-18 15:05:08 +09:00
parent 2e8a8a37d5
commit 4abaef93a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5846,8 +5846,8 @@ The `MergeInput` entity contains information about the merge
|Field Name ||Description
|`source` ||
The source to merge from, e.g. a complete or abbreviated commit SHA-1,
a complete reference name, a short reference name under refs/heads, refs/tags,
or refs/remotes namespace, etc.
a complete reference name, a short reference name under `refs/heads`, `refs/tags`,
or `refs/remotes` namespace, etc.
|`strategy` |optional|
The strategy of the merge, can be `recursive`, `resolve`,
`simple-two-way-in-core`, `ours` or `theirs`, default will use project settings.