Mercurial > jhg
diff cmdline/org/tmatesoft/hg/console/Manifest.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 | 45dc79e545f5 | 
| children | ee8264d80747 | 
