Mercurial > hg4j
comparison src/org/tmatesoft/hg/internal/FileSystemHelper.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 | 4e6179bde4fc |
| children | 661e77dc88ba |
comparison
equal
deleted
inserted
replaced
| 706:cd5c87d96315 | 707:42b88709e41d |
|---|