log src/org/tmatesoft/hg/internal/MergeStateBuilder.java @ 713:661e77dc88ba tip

age author description
Fri, 16 Aug 2013 19:22:59 +0200 Artem Tikhomirov Merge: support 'unresolved' resolution with MergeStateBuilder