log src/org/tmatesoft/hg/repo/HgMergeState.java @ 705:b4242b7e7dfe

age author description
Thu, 15 Aug 2013 18:43:50 +0200 Artem Tikhomirov Merge command: implement conflict resolution alternatives
Wed, 22 May 2013 15:52:31 +0200 Artem Tikhomirov Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions