diff src/org/tmatesoft/hg/repo/HgManifest.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 d42a45a2c9d6
children 5f9073eabf06
line wrap: on
line diff