From bd3e5b079c32efa2d2577798370f1fd58fa21191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Fri, 26 Jan 2018 12:19:48 -0500
Subject: [PATCH] https://github.com/NodeBB/NodeBB/issues/6248

---
 templates/topic.tpl | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/templates/topic.tpl b/templates/topic.tpl
index 2b3d07b..12a5d64 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -17,6 +17,18 @@
 			<span class="topic-title" component="topic/title">{title}</span>
 		</h1>
 
+		<div component="topic/merged/message" class="alert alert-warning<!-- IF !merger --> hidden<!-- ENDIF !merger --> clearfix">
+			<span class="pull-left">[[topic:merged_message, {mergeIntoTid}, {merger.mergedIntoTitle}]]</span>
+			<span class="pull-right">
+				<!-- IF merger -->
+				<a href="{config.relative_path}/user/{merger.userslug}">
+					<strong>{merger.username}</strong>
+				</a>
+				<small class="timeago" title="{mergedTimestampISO}"></small>
+				<!-- ENDIF merger -->
+			</span>
+		</div>
+
 		<div component="topic/deleted/message" class="alert alert-warning<!-- IF !deleted --> hidden<!-- ENDIF !deleted --> clearfix">
 			<span class="pull-left">[[topic:deleted_message]]</span>
 			<span class="pull-right">