comparison src/org/tmatesoft/hg/util/CancelSupport.java @ 496:c1c8f6859d3f

Recognize 'merged from parent' metastate in dirstate
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Mon, 22 Oct 2012 20:33:20 +0200
parents 9c9c442b5f2e
children
comparison
equal deleted inserted replaced
495:abfbe81154b5 496:c1c8f6859d3f