comparison COPYING @ 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 2353e4217f59
children
comparison
equal deleted inserted replaced
706:cd5c87d96315 707:42b88709e41d