Mercurial > jhg
diff src/org/tmatesoft/hg/internal/RequiresFile.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 | 71ddbf8603e8 | 
| children | ff4fdbab4e2d | 
