diff tests/failfilemerge.py @ 39519:5d69e2412ec8

shelve: use the internal phase when possible If the repository support it, use the internal phase for all changesets created by shelve.
author Boris Feld <boris.feld@octobus.net>
date Tue, 29 May 2018 12:12:18 +0200
parents c0ce60459d84
children 2372284d9457
line wrap: on
line diff