diff README @ 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 fb7e1e4e4d2c
children e9ded6c1db41 36eeab6e14b5
line wrap: on
line diff