log test-data/test-repos.jar @ 569:c4fd1037bc6f

age author description
Sun, 24 Feb 2013 00:11:40 +0100 Artem Tikhomirov Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision