comparison src/org/tmatesoft/hg/util/Adaptable.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 1a7a9a20e1f9
children 91d75e1bac9f
comparison
equal deleted inserted replaced
230:0dd9da7489dc 231:1792b37650f2