(refs #2)Add conflict checking.

Fork: 0

johnpearcey / gitbucket_jkp

Browse code (refs #2)Add conflict checking. master
1 parent e59ae9c commit f53f71ecf153f8cb67d0b3d1c439d2a754456a4f takezoe authored on 15 Jul 2013

Patch

Unified Split

Showing 4 changed files

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

Ignore Space Show notes View src/main/twirl/pulls/compare.scala.html

Ignore Space Show notes View src/main/twirl/pulls/discussion.scala.html

Ignore Space Show notes View src/main/twirl/pulls/pullreq.scala.html

Show line notes below