Merge pull request #1914 from peccu/prevent-parsig-filename-as-md-in-conflict-message

Prevent parsing filename as Markdown in conflict message

src/main/scala/gitbucket/core/service/MergeService.scala

@@ -298,7 +298,7 @@ object MergeService{
 
     s"Can't merge ${mergeTip.name} into ${mergeBaseTip.name}\n\n" +
       "Conflicting files:\n" +
-      mergeResults.asScala.map { case (key, _) => "- " + key + "\n" }.mkString
+      mergeResults.asScala.map { case (key, _) => "- `" + key + "`\n" }.mkString
   }
 
 }