Mercurial > hg4j
diff cmdline/org/tmatesoft/hg/console/Manifest.java @ 707:42b88709e41d
Merge: support 'unresolved' resolution with MergeStateBuilder
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Fri, 16 Aug 2013 19:22:59 +0200 |
parents | 6526d8adbc0f |
children |