Mercurial > hg4j
diff src/org/tmatesoft/hg/core/HgStatus.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 | ba2bf656f00f |
children | f052f40839ec |