Mercurial > hg
view mercurial/__init__.py @ 46160:1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
They are a logic and it is easy to explain, so lets explain it.
Differential Revision: https://phab.mercurial-scm.org/D9586
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 13 Dec 2020 19:18:10 +0100 |
parents | d783f945a701 |
children | 6000f5b25c9b |
line wrap: on
line source
# __init__.py - Startup and module loading logic for Mercurial. # # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import # Allow 'from mercurial import demandimport' to keep working. import hgdemandimport demandimport = hgdemandimport