Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgDataFile.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 | abfbe81154b5 |
children | e4ee4bf4c7d0 |