Mercurial > jhg
diff src/org/tmatesoft/hg/internal/ArrayHelper.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 | b9592e21176a | 
| children | 6334b0267103 | 
