comparison src/org/tmatesoft/hg/internal/WorkingDirFileWriter.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 2f9ed6bcefa2
children becd2a1310a2
comparison
equal deleted inserted replaced
559:6ca3d0c5b4bc 560:52263817b998