Mercurial > hg
comparison tests/test-simplemerge.py @ 28140:276644ae9e8d
destutil: allow to disable the "on head check" in destmerge
'hg merge' refuses to pick a default destination if the working copy is not on
a head. This is a very sensible default for 'hg merge' but 'hg rebase' should
work in this situation. So we introduce a way to disable this check. It will
soon be used by rebase.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 08 Feb 2016 22:58:15 +0000 |
parents | 56b2bcea2529 |
children | 86db5cb55d46 |
comparison
equal
deleted
inserted
replaced
28139:5476a7a039c0 | 28140:276644ae9e8d |
---|