Mercurial > hg4j
diff test/org/tmatesoft/hg/test/TestHistory.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 | e51dd9a14b6f |
children | 9c9c442b5f2e |