comparison src/org/tmatesoft/hg/repo/HgMergeState.java @ 322:d68dcb3b5f49

Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 30 Sep 2011 08:00:04 +0200
parents 6dbbc53fc46d
children f74e36b7344b
comparison
equal deleted inserted replaced
321:ac38e75c9e8e 322:d68dcb3b5f49