view .settings/org.eclipse.core.resources.prefs @ 496:c1c8f6859d3f

Recognize 'merged from parent' metastate in dirstate
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Mon, 22 Oct 2012 20:33:20 +0200
parents 868a5a6e9f93
children
line wrap: on
line source
#Thu Feb 24 18:49:36 CET 2011
eclipse.preferences.version=1
encoding/<project>=UTF-8