comparison src/org/tmatesoft/hg/repo/HgRepoConfig.java @ 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 db48a77ec8ff
children 36e36b926747
comparison
equal deleted inserted replaced
556:e55f17a7a195 557:b9e5ac26dd83