Mercurial > jhg
annotate lib/junit-4.8.2-src.jar @ 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 |
| rev | line source |
|---|---|
|
149
868a5a6e9f93
Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff
changeset
|
1 (binary:application/java-archive) |