Mercurial > hg4j
diff cmdline/org/tmatesoft/hg/console/Remote.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 | da426c2fe1ec |
children | 981f9f50bb6c |