Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgInvalidControlFileException.java @ 496:c1c8f6859d3f
Recognize 'merged from parent' metastate in dirstate
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Mon, 22 Oct 2012 20:33:20 +0200 |
| parents | 51d682cf9cdc |
| children | 6526d8adbc0f |
