diff README @ 269:1e375da37f2e

First part of testing the a merge with yields conflicts (with tool ":merge3")
author Franz Glasner <hg@dom66.de>
date Fri, 04 Jan 2019 17:09:30 +0100
parents fb7e1e4e4d2c
children e9ded6c1db41 36eeab6e14b5
line wrap: on
line diff