Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgDirstate.java @ 336:f74e36b7344b
Do not fail with HgBadStateException when there are no merge state
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Fri, 11 Nov 2011 05:56:09 +0100 |
parents | 72c6eda838a6 |
children | a0864b2892cd |