comparison hgext/gpg.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 aac4be30e250
children c303d65d2e34
comparison
equal deleted inserted replaced
38618:c829749e7639 38619:9b077e5fa8ba