Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-C2.t @ 3813:27e7ed2d13a6 stable
next-prev: always respect the --merge flag
An earlier bug fix series which started respecting commands.update.check
introduced a bug in which --merge was not respected sometimes. This patch fixes
that behavior by passing updatecheck as 'none' to hg.updatetotally() if --merge
is passed which is similar to what `hg update` does.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 08 Jun 2018 17:36:28 +0530 |
parents | e6bea259c227 |
children | 98941c28f3e2 ef22eef37ecc |
comparison
equal
deleted
inserted
replaced
3812:25dfa95c37fd | 3813:27e7ed2d13a6 |
---|