##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

zsh completion: disable defaults and verbose output when completing...
zsh completion: disable defaults and verbose output when completing If ui.verbose is set to True in hgrc, commands used to provide completions would yield bad results. For example, qpush completion would include the patch numbers and statuses as returned by qunapplied -v, instead of just the patch names. Defaults are also disabled when completing to prevent similar issues when an option is set that changes a command's output.
Pascal Quantin - - Load All Authors

File last commit:

r7867:01bd0efe default
r8982:9c0cecb7 default
Show More
mergetools.hgrc
63 lines | 2.0 KiB | text/plain | TextLexer
/ contrib / mergetools.hgrc
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 # Some default global settings for common merge tools
[merge-tools]
Neal Becker
mergetools.hgrc patch
 r6559 kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 kdiff3.regkey=Software\KDiff3
Steve Borho
filemerge: two fixes for kdiff3 example configuration
 r6011 kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=True
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 kdiff3.gui=True
gvimdiff.args=--nofork -d -g -O $local $other $base
Matt Mackall
mergetools: correct vim typo
 r6014 gvimdiff.regkey=Software\Vim\GVim
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 gvimdiff.regname=path
gvimdiff.priority=-9
merge.checkconflicts=True
merge.priority=-10
gpyfm.gui=True
meld.gui=True
tkdiff.args=$local $other -a $base -o $output
tkdiff.gui=True
tkdiff.priority=-8
xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
xxdiff.gui=True
xxdiff.priority=-8
diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
Steve Borho
filemerge: add 'checkchanged' merge tool property
 r6075 diffmerge.checkchanged=True
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 diffmerge.gui=True
p4merge.args=$base $local $other $output
p4merge.regkey=Software\Perforce\Environment
p4merge.regname=P4INSTROOT
p4merge.regappend=\p4merge.exe
p4merge.gui=True
p4merge.priority=-8
Pascal Quantin
Update win32 merge tools configuration...
 r7665 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 tortoisemerge.regkey=Software\TortoiseSVN
Pascal Quantin
Update win32 merge tools configuration...
 r7665 tortoisemerge.checkchanged=True
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 tortoisemerge.gui=True
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
ecmerge.gui=True
Brendan Cully
mergetools: add pointer to the usual filemerge path
 r7385 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
Matt Mackall
filemerge: add an example set of global settings for common merge tools
 r6008 filemerge.args=-left $other -right $local -ancestor $base -merge $output
filemerge.gui=True
Pascal Quantin
Update win32 merge tools configuration...
 r7665
Pascal Quantin
merge tools: fix typo in Beyond Compare's 3 command line...
 r7867 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
Pascal Quantin
Retrieve Beyond Compare's path from registry...
 r7683 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
beyondcompare3.regname=ExePath
Pascal Quantin
Update win32 merge tools configuration...
 r7665 beyondcompare3.gui=True
winmerge.args=/e /u /dl local /dr other /wr $local $other $output
winmerge.regkey=Software\Thingamahoochie\WinMerge
winmerge.regname=Executable
winmerge.checkchanged=True
winmerge.gui=True