Mercurial > jhg
diff src/org/tmatesoft/hg/util/CancelSupport.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 | f9f3e9b67ccc |