diff mercurial/keepalive.py @ 38619:9b077e5fa8ba

shelve: use more accurate description in conflict marker We use "shelve" and "working-copy" instead of "source" and "dest". This is a net win. Differential Revision: https://phab.mercurial-scm.org/D3694
author Boris Feld <boris.feld@octobus.net>
date Tue, 05 Jun 2018 12:04:15 +0200
parents e266e75d77dc
children d6d094259d9c
line wrap: on
line diff