Mercurial > hgrepos > DevTools > mercurial-extensions

changeset 244:6df0980520a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comment
author Franz Glasner <hg@dom66.de>
date Tue, 13 Nov 2018 09:14:00 +0100
parents 6b8a6329875a
children 25378fe77398
files extensions/timestamps.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/timestamps.py	Tue Nov 06 23:16:41 2018 +0100
+++ b/extensions/timestamps.py	Tue Nov 13 09:14:00 2018 +0100
@@ -475,7 +475,7 @@
                         comment.append(c2)
                 field = comment
             else:
-                # hit of merge markers
+                # hit of one of the merge markers "<|=>"
                 c3 = fp.peek(1)
 
                 if c3 and c3[0] == c:
@@ -491,7 +491,7 @@
                             #
                         else:
                             fp.read(1)
-                    # the "merge rev" block is really the last marker
+                    # a "> merge rev" block is the last marker of a merge block
                     if mergeblock_type == '>':
                         mergeblock_type = ''
                 else: