Mercurial > hg4j
diff cmdline/org/tmatesoft/hg/console/Main.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 | a54bfe0db959 |
| children | 58725dd511b3 |
line wrap: on
line diff
--- a/cmdline/org/tmatesoft/hg/console/Main.java Thu Nov 17 06:16:20 2011 +0100 +++ b/cmdline/org/tmatesoft/hg/console/Main.java Thu Nov 17 07:04:58 2011 +0100 @@ -99,9 +99,9 @@ // m.testParents(); // m.testEffectiveFileLog(); // m.testCatAtCsetRevision(); -// m.testMergeState(); + m.testMergeState(); // m.testFileStatus(); - m.dumpBranches(); +// m.dumpBranches(); // m.inflaterLengthException(); // m.dumpIgnored(); // m.dumpDirstate();