Mercurial > jhg
comparison src/org/tmatesoft/hg/util/FileIterator.java @ 707:42b88709e41d
Merge: support 'unresolved' resolution with MergeStateBuilder
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Fri, 16 Aug 2013 19:22:59 +0200 | 
| parents | b3b1db9301a2 | 
| children | 
   comparison
  equal
  deleted
  inserted
  replaced
| 706:cd5c87d96315 | 707:42b88709e41d | 
|---|
