diff src/org/tmatesoft/hg/internal/Patch.java @ 336:f74e36b7344b

Do not fail with HgBadStateException when there are no merge state
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 11 Nov 2011 05:56:09 +0100
parents 9747a786a34d
children 7f136a3fa671
line wrap: on
line diff