Mercurial > hg

annotate tests/bundles/issue4041.hg @ 31166:fad5e299cfc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: accept --merge to allow merging across topo branches (issue5125)
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 13 Feb 2017 12:58:37 -0800
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)