diff .settings/org.eclipse.jdt.core.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 dbd663faec1f
children
line wrap: on
line diff