--- a/mercurial/filemerge.py	Thu Nov 10 09:21:41 2016 -0800
+++ b/mercurial/filemerge.py	Sat Nov 19 15:41:37 2016 -0800
@@ -518,7 +518,8 @@
     return util.ellipsis(mark, 80 - 8)
 
 _defaultconflictmarker = ('{node|short} '
-                          '{ifeq(tags, "tip", "", "{tags} ")}'
+                          '{ifeq(tags, "tip", "", '
+                           'ifeq(tags, "", "", "{tags} "))}'
                           '{if(bookmarks, "{bookmarks} ")}'
                           '{ifeq(branch, "default", "", "{branch} ")}'
                           '- {author|user}: {desc|firstline}')