log src/org/tmatesoft/hg/repo/HgMergeState.java @ 231:1792b37650f2

age author description
2011-06-01 Artem Tikhomirov Introduced access to conflict resolution information (merge state)