diff src/org/tmatesoft/hg/repo/HgManifest.java @ 705:b4242b7e7dfe

Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200
parents 5d8798772cca
children 42b88709e41d
line wrap: on
line diff