Mercurial > hg4j
comparison .settings/org.eclipse.core.resources.prefs @ 705:b4242b7e7dfe
Merge command: implement conflict resolution alternatives
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 15 Aug 2013 18:43:50 +0200 |
| parents | 868a5a6e9f93 |
| children |
comparison
equal
deleted
inserted
replaced
| 704:7743a9c10bfa | 705:b4242b7e7dfe |
|---|