comparison src/org/tmatesoft/hg/core/HgDataStreamException.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 6d1804fe0ed7
comparison
equal deleted inserted replaced
230:0dd9da7489dc 231:1792b37650f2