diff .settings/org.eclipse.core.resources.prefs @ 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 868a5a6e9f93
children
line wrap: on
line diff