comparison src/org/tmatesoft/hg/repo/HgMergeState.java @ 582:90df078d6418

Delegate cancel to original support, do not implement CancelSupport ourselves
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Mon, 22 Apr 2013 19:17:29 +0200
parents b3c16d1aede0
children 6526d8adbc0f
comparison
equal deleted inserted replaced
581:0890628ed51e 582:90df078d6418