view lib/junit-4.8.2-src.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 868a5a6e9f93
children
line wrap: on
line source
(binary:application/java-archive)