diff options
Diffstat (limited to 'polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html')
| -rw-r--r-- | polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html index 799cf5943b..be7f3da842 100644 --- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html +++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html @@ -194,6 +194,18 @@ limitations under the License. </gr-select> </span> </section> + <section hidden$="[[!_localPrefs.default_base_for_merges]]"> + <span class="title">Default Base For Merges</span> + <span class="value"> + <gr-select + bind-value="{{_localPrefs.default_base_for_merges}}"> + <select> + <option value="AUTO_MERGE">Auto Merge</option> + <option value="FIRST_PARENT">First Parent</option> + </select> + </gr-select> + </span> + </section> <section> <span class="title">Diff view</span> <span class="value"> |