Mercurial > jhg
diff src/org/tmatesoft/hg/internal/DataAccessProvider.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 | 981f9f50bb6c | 
| children | 3cfa4d908fc9 | 
