Only show conflicted files if not merged (#10197)

* Only show conflicted files if not merged

* try again

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: techknowlogick <matti@mdranta.net>

Author: 3 people

templates/repo/issue/list.tmpl

@@ -268,7 +268,7 @@
 							</a>
 						{{end}}
 						{{if .IsPull}}
-							{{if (len .PullRequest.ConflictedFiles) gt 0}}
+							{{if and (not .PullRequest.HasMerged) ((len .PullRequest.ConflictedFiles) gt 0)}}
 								<span class="conflicting"><i class="octicon octicon-mirror"></i> {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
 							{{end}}
 						{{end}}

templates/user/dashboard/issues.tmpl

@@ -152,7 +152,7 @@
 									</span>
 								{{end}}
 								{{if .IsPull}}
-									{{if (len .PullRequest.ConflictedFiles) gt 0}}
+									{{if and (not .PullRequest.HasMerged) ((len .PullRequest.ConflictedFiles) gt 0)}}
 										<span class="conflicting"><i class="octicon octicon-mirror"></i> {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
 									{{end}}
 								{{end}}