Mercurial > jhg
comparison src/org/tmatesoft/hg/internal/ByteArrayDataAccess.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 | b413b16d10a5 | 
| children | 6c22bdc0bdfd | 
   comparison
  equal
  deleted
  inserted
  replaced
| 230:0dd9da7489dc | 231:1792b37650f2 | 
|---|
