Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgBookmarks.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 | d2f6ab541330 | 
| children | c56edf42be64 | 
