log src/org/tmatesoft/hg/internal/Internals.java @ 708:4ffc17c0b534

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