Mercurial > hg

annotate tests/bundles/issue4041.hg @ 23405:2a038deeac9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: 0 is a valid ancestor different from None Most internal functions can take either a hash or an integer. Merge did however not handle 0 as revision 0. Now it does.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 30 Nov 2014 19:26:53 +0100
parents ad9db007656f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19969
ad9db007656f rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
1 (binary:application/octet-stream)