set filename in conflict message as code

2026-05-07 16:46:54 +02:00 · 2018-03-17 11:52:20 +09:00
parent b89c99d388
commit 33812cb337
1 changed files with 1 additions and 1 deletions
--- a/src/main/scala/gitbucket/core/service/MergeService.scala
+++ b/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
  }

 }