diff README @ 237:9249ca818ddf

Recognize blocks enclosed with merge tool markers. BUGS: Right now they will be skipped. What to do with them. Push upstream?
author Franz Glasner <hg@dom66.de>
date Wed, 31 Oct 2018 09:40:53 +0100
parents fb7e1e4e4d2c
children e9ded6c1db41 36eeab6e14b5
line wrap: on
line diff