diff src/org/tmatesoft/hg/core/HgBadStateException.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 d5268ca7715b
children 2747b0723867
line wrap: on
line diff