Mercurial > jhg

log src/org/tmatesoft/hg/repo/HgMergeState.java @ 346:6d2c6b2469fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -2 tip
age author description
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
less more | (0) -2 tip