diff src/org/tmatesoft/hg/util/Adaptable.java @ 341:75c452fdd76a

Merging state not detected when there's no conflicts to resolve (no merge/state file)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 17 Nov 2011 07:04:58 +0100
parents 1a7a9a20e1f9
children 91d75e1bac9f
line wrap: on
line diff