diff src/org/tmatesoft/hg/core/Nodeid.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 3a7696fb457c
children 4b661efb9374
line wrap: on
line diff