Mercurial > hg4j
diff test/org/tmatesoft/hg/test/TestDirstate.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 | 02f2963c70fa |
children | df5009d67be2 |