Mercurial > jhg
log src/org/tmatesoft/hg/repo/HgMergeState.java @ 367:2fadf8695f8a
age | author | description |
---|---|---|
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) |
Fri, 11 Nov 2011 05:56:09 +0100 | Artem Tikhomirov | Do not fail with HgBadStateException when there are no merge state |