Mercurial > jhg
diff src/org/tmatesoft/hg/core/HgIncomingCommand.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 | d68dcb3b5f49 |
children | 189dc6dc1c3e |