Mercurial > hg4j
diff 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 | 
