diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 511:122e0600799f

Respect multiple joins/forks in a history of a single file
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 14 Dec 2012 15:39:49 +0100
parents b3c16d1aede0
children 6526d8adbc0f
line wrap: on
line diff