Mercurial > hg4j
diff .settings/org.eclipse.core.resources.prefs @ 330:9747a786a34d
Patch merging algorithm complete trial
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Tue, 25 Oct 2011 03:30:02 +0200 | 
| parents | 868a5a6e9f93 | 
| children | 
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Tue, 25 Oct 2011 03:30:02 +0200 | 
| parents | 868a5a6e9f93 | 
| children |