Mercurial > hg
diff tests/test-up-local-change.t @ 44399:a45ffad9ae98
merge: introduce a merge() for that use-case
In the same vein as some earlier patches like f546d2170b0f (merge:
introduce a clean_update() for that use-case, 2020-01-15).
Differential Revision: https://phab.mercurial-scm.org/D8168
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 26 Feb 2020 10:40:31 -0800 |
parents | baf3fe2977cc |
children | c4f14db3da1d |