Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgDirstate.java @ 341:75c452fdd76a
Merging state not detected when there's no conflicts to resolve (no merge/state file)
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Thu, 17 Nov 2011 07:04:58 +0100 |
parents | 72c6eda838a6 |
children | a0864b2892cd |