log src/org/tmatesoft/hg/repo/HgMergeState.java @ 235:fd845a53f53d

age author description
Wed, 01 Jun 2011 05:44:25 +0200 Artem Tikhomirov Introduced access to conflict resolution information (merge state)