From 33812cb3370b34aee723ad77626f101df54f77b5 Mon Sep 17 00:00:00 2001
From: peccu <peccul@gmail.com>
Date: Sat, 17 Mar 2018 11:52:20 +0900
Subject: [PATCH] set filename in conflict message as code

---
 src/main/scala/gitbucket/core/service/MergeService.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/gitbucket/core/service/MergeService.scala b/src/main/scala/gitbucket/core/service/MergeService.scala
index 6888c8a1e..ed2b4b40d 100644
--- 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
   }
 
 }