log src/org/tmatesoft/hg/repo/HgMergeState.java @ 321:ac38e75c9e8e

age author description
Sat, 03 Sep 2011 21:46:13 +0200 Artem Tikhomirov Use Path instead of plain String for manifest file names
Sat, 03 Sep 2011 13:12:13 +0200 Artem Tikhomirov HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
Wed, 24 Aug 2011 04:10:17 +0200 Artem Tikhomirov Avoid IAE:nullid when looking into stale merge/state file