log src/org/tmatesoft/hg/util/Path.java @ 709:497e697636fc

age author description
Thu, 15 Aug 2013 18:43:50 +0200 Artem Tikhomirov Merge command: implement conflict resolution alternatives
Wed, 10 Jul 2013 11:48:55 +0200 Artem Tikhomirov Merge branch smartgit-4.5 (no actual changes, merely to denote branch is inactive