Mercurial > hg4j
diff test/org/tmatesoft/hg/test/ErrorCollectorExt.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 | 0b2dcca7de9f |
children | 7af843ecc378 |