# HG changeset patch
# User Franz Glasner <hg@dom66.de>
# Date 1540800595 -3600
# Node ID 0158ebd7285be01d7ede13e0ea8c11abd5859308
# Parent  9afda6ec16d81fd6377870f8c1bb19142bfeae18
Comments

diff -r 9afda6ec16d8 -r 0158ebd7285b extensions/timestamps.py
--- a/extensions/timestamps.py	Sun Oct 28 16:48:15 2018 +0100
+++ b/extensions/timestamps.py	Mon Oct 29 09:09:55 2018 +0100
@@ -911,6 +911,9 @@
             self.__from_parents = [p.hex() for p in self[None].parents()]
 
         def _ts_update(self, parent1=None, parent2=None, error=0, preview=False):
+            """Called on :hg:`hg update` and :hg:`hg merge`
+
+            """
             if not self.local():
                 self.ui.debug("update.timestamps: repo is not local\n")
                 return