diff design.txt @ 231:1792b37650f2

Introduced access to conflict resolution information (merge state)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 01 Jun 2011 05:44:25 +0200
parents 9ce3b26798c4
children 2fadf8695f8a
line wrap: on
line diff