log src/org/tmatesoft/hg/repo/HgMergeState.java @ 422:5d1cc7366d04

age author description
Thu, 22 Mar 2012 18:54:11 +0100 Artem Tikhomirov Explicit constant for regular file flags, access to flags for a given file revision
Fri, 16 Dec 2011 15:37:27 +0100 Artem Tikhomirov Use 'revision index' instead of the vague 'local revision number' concept in the API
Thu, 24 Nov 2011 02:57:03 +0100 Artem Tikhomirov Expose errors reading mercurial control files with exception
Thu, 17 Nov 2011 07:04:58 +0100 Artem Tikhomirov Merging state not detected when there's no conflicts to resolve (no merge/state file)