diff cmdline/org/tmatesoft/hg/console/Pull.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 b1a3a056d7e6
children
line wrap: on
line diff