diff src/org/tmatesoft/hg/util/CancelSupport.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 f9f3e9b67ccc
children 91d75e1bac9f
line wrap: on
line diff