Mercurial > hg

comparison mercurial/simplemerge.py @ 25934:e283c5d922db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: add __future__ to ignore list __future__ is special. We should definitely not be trying to lazy load it.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 08 Aug 2015 17:12:37 -0700
parents 83df50a8d61c
children 241a1324a180
comparison
equal deleted inserted replaced
25933:1fc6c02782ab 25934:e283c5d922db