log src/org/tmatesoft/hg/internal/MergeStateBuilder.java @ 705:b4242b7e7dfe

age author description
Thu, 15 Aug 2013 18:43:50 +0200 Artem Tikhomirov Merge command: implement conflict resolution alternatives