diff tests/test-merge7.t @ 45860:073bb7563931

shelve: clear merge state after partial shelve Differential Revision: https://phab.mercurial-scm.org/D9335
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 16 Nov 2020 21:28:42 -0800
parents 91a0bc50b288
children 69429972ff1f
line wrap: on
line diff