Merge branch 'master' into show-conflict-files

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' into show-conflict-files master
commit 5b3c3e2e7c0c44c005f41dbf03e2c8c225005056 2 parents 1033122 + 0e04925 Naoki Takezoe authored on 12 Dec 2017

Patch

Unified Split

Showing 4 changed files

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

Ignore Space Show notes View src/main/scala/gitbucket/core/service/MergeService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/JGitUtil.scala

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

Show line notes below