comparison tests/lib-stat.py @ 285:b347f938a2cd

FIX: Handle conflict marker output properly in "timestamps --show". This is needed because now the corresponding value is _conflictobj instead of None.
author Franz Glasner <hg@dom66.de>
date Mon, 07 Jan 2019 09:34:51 +0100
parents 7ec353866f70
children 379050873141
comparison
equal deleted inserted replaced
284:66f526666b96 285:b347f938a2cd