comparison src/org/tmatesoft/hg/internal/PathScope.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 1ec6b327a6ac
children 072b5f3ed0c8
comparison
equal deleted inserted replaced
340:a54bfe0db959 341:75c452fdd76a