Mercurial > hg4j
annotate lib/junit-4.8.2.jar @ 341:75c452fdd76a
Merging state not detected when there's no conflicts to resolve (no merge/state file)
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 17 Nov 2011 07:04:58 +0100 |
| parents | 777ab7034c1b |
| children |
| rev | line source |
|---|---|
|
101
777ab7034c1b
Switch to JUnit for tests
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
1 (binary:application/java-archive) |