Mercurial > jhg
comparison src/org/tmatesoft/hg/internal/RevlogStream.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 | 80a3433ace91 | 
| children | ad6a046943be | 
   comparison
  equal
  deleted
  inserted
  replaced
| 230:0dd9da7489dc | 231:1792b37650f2 | 
|---|
