Mercurial > hg
comparison tests/test-merge1.t @ 27746:f0e9f38d250f
rebase: prevent creating divergence
Before this patch rebase would create divergence when you were rebasing obsolete
changesets on a destination not containing one of its successors.
This patch introduces rebase.allowdivergence to explicitly allow
divergence creation with rebase.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Tue, 12 Jan 2016 13:43:41 -0800 |
parents | 6b639caa1652 |
children | 1e4512eac59e |
comparison
equal
deleted
inserted
replaced
27745:d3a128e8604a | 27746:f0e9f38d250f |
---|