diff src/org/tmatesoft/hg/core/HgRepoFacade.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 7743a9c10bfa
children
line wrap: on
line diff