comparison test-data/test-repos.jar @ 557:b9e5ac26dd83

Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Sun, 24 Feb 2013 00:11:40 +0100
parents 093a2022dad5
children 36853bb80a35
comparison
equal deleted inserted replaced
556:e55f17a7a195 557:b9e5ac26dd83
1 (binary file application/java-archive, hash: c3bb260fefc38d06ca4d3dcfd877b749b2142bf5) 1 (binary file application/java-archive, hash: 615f5d59fbaac9f5c6ace1cdfc19388349edc469)