##// END OF EJS Templates
hidden: remove tags use in hidden computation...
hidden: remove tags use in hidden computation Tags initially prevented revision to be hidden. It seemed a bad idea to have tags refer to revisions that one can't see. But proper filtering of hidden revisions excludes them from tag computation. Coming changelog filtering will do that. Anyway, tags that really matter will likely be public and therefore not hidden. The current working directory parent and bookmarked revision are still not hidden. Bookmarks were likely automatically moved at rewrite time, bookmarks that remain on obsolete revisions were probably moved there on purpose.

File last commit:

r17422:93bc65e9 stable
r17716:1adba7ff default
Show More
mergetools.hgrc
124 lines | 4.8 KiB | text/plain | TextLexer
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
mergetools: add alternate registry keys for 32bit apps on 64bit O/S...
r13566 kdiff3.regkeyalt=Software\Wow6432Node\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
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008
gvimdiff.args=--nofork -d -g -O $local $other $base
Matt Mackall
mergetools: correct vim typo
r6014 gvimdiff.regkey=Software\Vim\GVim
Steve Borho
mergetools: add alternate registry keys for 32bit apps on 64bit O/S...
r13566 gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008 gvimdiff.regname=path
gvimdiff.priority=-9
Martin Geisler
mergetools.hgrc: add vimdiff...
r11506 vimdiff.args=$local $other $base
Pierre-Yves David
mergetools.hgrc: set vimdiff to check=changed...
r17422 vimdiff.check=changed
Martin Geisler
mergetools.hgrc: add vimdiff...
r11506 vimdiff.priority=-10
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008 merge.checkconflicts=True
David Champion
give worst-case 'merge' merge-tool lowest priority...
r11147 merge.priority=-100
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008
gpyfm.gui=True
meld.gui=True
Steve Borho
mergetools: improve configuration for several merge tools...
r10486 meld.args=--label='local' $local --label='base' $base --label='other' $other
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008
tkdiff.args=$local $other -a $base -o $output
tkdiff.gui=True
tkdiff.priority=-8
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008
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
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008
Steve Borho
mergetools: improve configuration for several merge tools...
r10486 diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
Steve Borho
mergetools: add alternate registry keys for 32bit apps on 64bit O/S...
r13566 diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
Steve Borho
mergetools: improve configuration for several merge tools...
r10486 diffmerge.regname=Location
diffmerge.priority=-7
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
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
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008
p4merge.args=$base $local $other $output
p4merge.regkey=Software\Perforce\Environment
Steve Borho
mergetools: add alternate registry keys for 32bit apps on 64bit O/S...
r13566 p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008 p4merge.regname=P4INSTROOT
p4merge.regappend=\p4merge.exe
p4merge.gui=True
p4merge.priority=-8
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 p4merge.diffargs=$parent $child
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008
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
Steve Borho
mergetools: add alternate registry keys for 32bit apps on 64bit O/S...
r13566 tortoisemerge.regkeyalt=Software\Wow6432Node\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
Steve Borho
mergetools: improve configuration for several merge tools...
r10486 tortoisemerge.priority=-8
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
Steve Borho
mergetools: add alternate registry keys for 32bit apps on 64bit O/S...
r13566 ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008 ecmerge.gui=True
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
Matt Mackall
filemerge: add an example set of global settings for common merge tools
r6008
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
Steve Borho
mergetools: improve configuration for several merge tools...
r10486 ; Windows version of Beyond Compare
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
Steve Borho
mergetools: improve configuration for several merge tools...
r10486 beyondcompare3.priority=-2
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
Pascal Quantin
Update win32 merge tools configuration...
r7665
Steve Borho
mergetools: improve configuration for several merge tools...
r10486 ; Linux version of Beyond Compare
bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
bcompare.premerge=False
bcompare.gui=True
bcompare.priority=-1
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child
Steve Borho
mergetools: improve configuration for several merge tools...
r10486
winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
Pascal Quantin
Update win32 merge tools configuration...
r7665 winmerge.regkey=Software\Thingamahoochie\WinMerge
Steve Borho
mergetools: add alternate registry keys for 32bit apps on 64bit O/S...
r13566 winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
Pascal Quantin
Update win32 merge tools configuration...
r7665 winmerge.regname=Executable
winmerge.checkchanged=True
winmerge.gui=True
Steve Borho
mergetools: improve configuration for several merge tools...
r10486 winmerge.priority=-10
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child
Steve Borho
mergetools: improve configuration for several merge tools...
r10486
araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
araxis.regappend=\ConsoleCompare.exe
araxis.priority=-2
araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
araxis.premerge=False
araxis.checkconflict=True
araxis.binary=True
araxis.gui=True
Steve Borho
extdiff: add labels, read diff arguments from [merge-tools]...
r11184 araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child
diffuse.priority=-3
diffuse.args=$local $base $other
diffuse.gui=True
diffuse.diffargs=$parent $child
Steve Borho
mergetools: add configuration for Ultra Compare (issue2226)...
r11308
UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
Steve Borho
mergetools: add alternate registry keys for 32bit apps on 64bit O/S...
r13566 UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
Steve Borho
mergetools: add configuration for Ultra Compare (issue2226)...
r11308 UltraCompare.args = $base $local $other -title1 base -title3 other
UltraCompare.priority = -2
UltraCompare.gui = True
UltraCompare.binary = True
UltraCompare.checkconflicts = True
UltraCompare.checkchanged = True
UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1