Mercurial > hg

view hgext/progress.py @ 27025:ec37257341a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 23:43:18 -0800
parents 5ef327e9c157
children
line wrap: on
line source

# progress.py show progress bars for some actions
#
# Copyright (C) 2010 Augie Fackler <durin42@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.

"""show progress bars for some actions (DEPRECATED)

This extension has been merged into core, you can remove it from your config.
See hg help config.progress for configuration options.
"""
# Note for extension authors: ONLY specify testedwith = 'internal' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = 'internal'