log src/org/tmatesoft/hg/repo/HgMergeState.java @ 346:6d2c6b2469fc

age author description
Thu, 17 Nov 2011 07:04:58 +0100 Artem Tikhomirov Merging state not detected when there's no conflicts to resolve (no merge/state file)