Show conflicting files

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Show conflicting files master
1 parent 847f96d commit 1033122fec75eb214c9be304754ad94d68a2ee5f Naoki Takezoe authored on 11 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/service/PullRequestService.scala

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

Show line notes below