log src/org/tmatesoft/hg/internal/CommitFacility.java @ 712:a864fb309e4b

age author description
Tue, 20 Aug 2013 18:41:34 +0200 Artem Tikhomirov Merge: tests for resolver and complex scenario. Enable commit for merged revisions. Reuse file revisions if nothing changed
Thu, 15 Aug 2013 18:43:50 +0200 Artem Tikhomirov Merge command: implement conflict resolution alternatives