Mercurial > hg4j
view .settings/org.eclipse.core.resources.prefs @ 549:83afa680555d
Annotate merge revision (combined diff against two parents without looking further)
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Tue, 19 Feb 2013 21:17:39 +0100 |
parents | 868a5a6e9f93 |
children |
line wrap: on
line source
#Thu Feb 24 18:49:36 CET 2011 eclipse.preferences.version=1 encoding/<project>=UTF-8