Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/bundles/issue4041.hg
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Wed, 30 Oct 2013 19:45:14 +0100
branchstable
changeset 19969 ad9db007656f
permissions -rw-r--r--
rebase: fix selection of base used when rebasing merge (issue4041) Prior this changeset, rebasing a merge whose first parent was not in the rebase lead to wrong and highly conflicting merge. See the in-line comment for details. Test have been updated with the data provided by the reported.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)
Mercurial