Mercurial > hg4j
diff .settings/org.eclipse.core.resources.prefs @ 560:52263817b998
Exception when no blocks from merged revision were reported and merge parent was not recorded for future use
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Tue, 26 Feb 2013 21:06:43 +0100 | 
| parents | 868a5a6e9f93 | 
| children | 
