diff options
Diffstat (limited to 'routers/repo/pull.go')
| -rw-r--r-- | routers/repo/pull.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go index c060aeb4b5..a65b68a96e 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -345,6 +345,11 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.PullReq ctx.Data["WorkInProgressPrefix"] = pull.GetWorkInProgressPrefix() } + if pull.IsFilesConflicted() { + ctx.Data["IsPullFilesConflicted"] = true + ctx.Data["ConflictedFiles"] = pull.ConflictedFiles + } + ctx.Data["NumCommits"] = prInfo.Commits.Len() ctx.Data["NumFiles"] = prInfo.NumFiles return prInfo |