diff test/org/tmatesoft/hg/test/TestManifest.java @ 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 f4fa4456fa50
children 4c3b9f679412
line wrap: on
line diff