diff COPYING @ 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 a3a2e5deb320
children 3ca4ae7bdd38
line wrap: on
line diff