Add a pulldown menu to choose the merge strategy

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Add a pulldown menu to choose the merge strategy master
1 parent 332a1b4 commit 2d58b7f2d75589c17dd96af835e918e8cbe97d84 Naoki Takezoe authored on 10 Dec 2017

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/PullRequestsController.scala

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html

Show line notes below