Mercurial > hg4j
diff .settings/org.eclipse.core.runtime.prefs @ 231:1792b37650f2
Introduced access to conflict resolution information (merge state)
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Wed, 01 Jun 2011 05:44:25 +0200 | 
| parents | 868a5a6e9f93 | 
| children | 
