Mercurial > jhg
comparison src/org/tmatesoft/hg/core/HgManifestHandler.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 | 31a89587eb04 |
| children | 6526d8adbc0f |
comparison
equal
deleted
inserted
replaced
| 495:abfbe81154b5 | 496:c1c8f6859d3f |
|---|