Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 26653 cffc4f7c6c36
parent 26652 c502be14b4e2
child 26676 71a485130beb 
--- a/mercurial/commands.py	Wed Sep 30 21:47:27 2015 -0700
+++ b/mercurial/commands.py	Wed Sep 30 21:48:53 2015 -0700
@@ -2512,8 +2512,9 @@
                 ui.write(('other: %s\n') % record)
             elif rtype == 'm':
                 driver, mdstate = record.split('\0', 1)
-                ui.write(('merge driver: %s (state "%s")\n') % (driver, mdstate))
-            elif rtype == 'F':
+                ui.write(('merge driver: %s (state "%s")\n')
+                         % (driver, mdstate))
+            elif rtype in 'FD':
                 r = record.split('\0')
                 f, state, hash, lfile, afile, anode, ofile = r[0:7]
                 if version == 1:
Mercurial