Mercurial > hg
diff mercurial/exchange.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 | 4d5fb4062f0b |
children | 9b64b73d702b |