Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgLookup.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 | 2f9ed6bcefa2 | 
| children | f97e81d13190 | 
