comparison tests/test-casecollision-merge.t @ 39376:5f8282f368b2

shelve: add an "internal" extra Keeping shelve changeset around increase the risk of collision with normal changesets. To prevent such collision and help with overall clarity, we add an 'internal' key in extra that mark the changeset as created by "shelve". Node changes in tests are expected.
author Boris Feld <boris.feld@octobus.net>
date Wed, 06 Jun 2018 01:46:37 +0200
parents 8e472f3b7c63
children f4f07cc92a47
comparison
equal deleted inserted replaced
39375:38373da1af02 39376:5f8282f368b2