diff src/org/tmatesoft/hg/internal/DirstateBuilder.java @ 560:52263817b998

Exception when no blocks from merged revision were reported and merge parent was not recorded for future use
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Tue, 26 Feb 2013 21:06:43 +0100
parents 95bdcf75e71e
children bd5926e24aa3
line wrap: on
line diff