diff src/org/tmatesoft/hg/internal/Callback.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 9c9c442b5f2e
children
line wrap: on
line diff