Mercurial > hg

diff mercurial/merge.py @ 30920:dc9f086c7691

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lock: move lock._host calculation to a function This allows customization per platform. See the next patch for why.
author Jun Wu <quark@fb.com>
date Fri, 10 Feb 2017 13:35:21 -0800
parents dd995a5db8fd
children 330fbd515512
line wrap: on
line diff