diff src/org/tmatesoft/hg/repo/HgDataFile.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 41a778e3fd31
children 1d389c0cb0a5
line wrap: on
line diff