Mercurial > hg
view contrib/tcsh_completion @ 12765:5eed9ceebd64
merge: when --tool is specified, disable HGMERGE by setting to empty string
HGMERGE has different semantics than ui.merge. HGMERGE should hold the name
on an executable in your path, or an absolute tool path. As such, it's not
safe to simply copy the user's specified --tool value into HGMERGE. Instead,
we disable HGMERGE by setting it to an empty string.
author | Steve Borho <steve@borho.org> |
---|---|
date | Mon, 18 Oct 2010 23:20:14 -0500 |
parents | 4061205ad9e1 |
children | 2616325766e3 |
line wrap: on
line source
# # tcsh completion for Mercurial # # This file has been auto-generated by tcsh_completion_build.sh for # Mercurial Distributed SCM (version 1.5.4+154-8b452fe4bf50) # # Copyright (C) 2005 TK Soh. # # This is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation; either version 2 of the License, or (at your # option) any later version. # complete hg \ 'n/--cwd/d/' 'n/-R/d/' 'n/--repository/d/' \ 'C/-/( -R --repository \ --cwd \ -y --noninteractive \ -q --quiet \ -v --verbose \ --config \ --debug \ --debugger \ --encoding \ --encodingmode \ --traceback \ --time \ --profile \ --version \ -h --help)/' \ 'p/1/(add addremove annotate blame archive \ backout bisect branch branches bundle \ cat clone commit ci copy \ cp debugancestor debugbuilddag debugcheckstate debugcommands \ debugcomplete debugdag debugdata debugdate debugfsinfo \ debugindex debugindexdot debuginstall debugpushkey debugrebuildstate \ debugrename debugrevspec debugsetparents debugstate debugsub \ debugwalk diff export forget grep \ heads help identify id import \ patch incoming in init locate \ log history manifest merge outgoing \ out parents paths pull push \ recover remove rm rename mv \ resolve revert rollback root serve \ showconfig debugconfig status st summary \ sum tag tags tip unbundle \ update up checkout co verify \ version)/'