Improve checkConflict

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Improve checkConflict * Delete temporary RefSpec after checkConflict * mergeguide use checkconflictInPullRequest instead of checkconflict master
1 parent dcbf283 commit f96040eaded5d4ec4687f0405b2f87cfdb0ba8fc Tomofumi Tanaka authored on 29 Oct 2013

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View src/main/scala/app/PullRequestsController.scala

Ignore Space Show notes View src/main/scala/util/ControlUtil.scala

Show line notes below