Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgMergeState.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 | b3c16d1aede0 |
children | 6526d8adbc0f |