log src/org/tmatesoft/hg/repo/HgMergeState.java @ 246:ff4fdbab4e2d

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