comparison cmdline/org/tmatesoft/hg/console/Main.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 a674b8590362
children 863356c2847e
comparison
equal deleted inserted replaced
335:3d41dc148d14 336:f74e36b7344b