@(hasConflict: Boolean, pullreq: model.PullRequest, requestRepositoryUrl: String)(implicit context: app.Context) @import context._ @import view.helpers._
@if(hasConflict){ We can’t automatically merge this pull request. } else { This pull request can be automatically merged. }
@if(hasConflict){ Use the command line to resolve conflicts before continuing. } else { You can also merge branches on the command line. }