Mercurial > hg4j
comparison src/org/tmatesoft/hg/repo/HgMergeState.java @ 549:83afa680555d
Annotate merge revision (combined diff against two parents without looking further)
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Tue, 19 Feb 2013 21:17:39 +0100 |
| parents | b3c16d1aede0 |
| children | 6526d8adbc0f |
comparison
equal
deleted
inserted
replaced
| 548:ab21ac7dd833 | 549:83afa680555d |
|---|