log src/org/tmatesoft/hg/repo/HgManifest.java @ 708:4ffc17c0b534

age author description
Fri, 16 Aug 2013 19:22:59 +0200 Artem Tikhomirov Merge: support 'unresolved' resolution with MergeStateBuilder
Wed, 10 Jul 2013 11:48:55 +0200 Artem Tikhomirov Merge branch smartgit-4.5 (no actual changes, merely to denote branch is inactive