diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 398:c76c57f6b961

Merge fixed for issue 24 and issue 26 from smartgit3 branch
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 23 Feb 2012 21:53:21 +0100
parents 2fadf8695f8a
children ee8264d80747
line wrap: on
line diff