log src/org/tmatesoft/hg/internal/DirstateBuilder.java @ 707:42b88709e41d

age author description
Fri, 16 Aug 2013 19:22:59 +0200 Artem Tikhomirov Merge: support 'unresolved' resolution with MergeStateBuilder
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
Wed, 15 May 2013 20:10:09 +0200 Artem Tikhomirov Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed