Mercurial > hg
view tests/test-gendoc.out @ 10505:b3311e26f94f stable
merge: fix --preview to show all nodes that will be merged (issue2043).
Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge. The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Feb 2010 15:25:29 -0500 |
parents | 6219401643d1 |
children | cbe400a8e217 |
line wrap: on
line source
% extracting documentation from C checking for parse errors with rst2html % extracting documentation from da checking for parse errors with rst2html % extracting documentation from de checking for parse errors with rst2html % extracting documentation from el checking for parse errors with rst2html % extracting documentation from fr checking for parse errors with rst2html % extracting documentation from it checking for parse errors with rst2html % extracting documentation from ja checking for parse errors with rst2html % extracting documentation from pt_BR checking for parse errors with rst2html % extracting documentation from sv checking for parse errors with rst2html % extracting documentation from zh_CN checking for parse errors with rst2html % extracting documentation from zh_TW checking for parse errors with rst2html