Mercurial > hg4j
annotate .settings/org.eclipse.core.resources.prefs @ 709:497e697636fc
Report merged lines as changed block if possible, not as a sequence of added/deleted blocks. To facilitate access to merge parent lines AddBlock got mergeLineAt() method that reports index of the line in the second parent (if any), while insertedAt() has been changed to report index in the first parent always
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Wed, 21 Aug 2013 16:23:27 +0200 |
parents | 868a5a6e9f93 |
children |
rev | line source |
---|---|
149
868a5a6e9f93
Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff
changeset
|
1 #Thu Feb 24 18:49:36 CET 2011 |
868a5a6e9f93
Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff
changeset
|
2 eclipse.preferences.version=1 |
868a5a6e9f93
Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff
changeset
|
3 encoding/<project>=UTF-8 |