Mercurial > hg4j
diff src/org/tmatesoft/hg/internal/DirstateBuilder.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 | 95bdcf75e71e |
children | bd5926e24aa3 |