diff test/org/tmatesoft/hg/test/LogOutputParser.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 7a908ba66ff3
children 934037edbea0
line wrap: on
line diff