Mercurial > hg4j
diff .settings/org.eclipse.core.runtime.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 | 
