Mercurial > hg > mercurial
view mercurial-tests/testData/bin/Mercurial.ini @ 152:8532bc45bb32
Test for collecting changes between 2 same roots
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Tue, 11 Jan 2011 15:47:47 +0300 |
parents | 6fada1d52902 |
children |
line wrap: on
line source
; System-wide Mercurial config file. ; ; !!! Do Not Edit This File !!! ; ; This file will be replaced by the installer on every upgrade. ; Editing this file can cause strange side effects on Vista. ; ; http://bitbucket.org/tortoisehg/stable/issue/135 ; ; To change settings you see in this file, override (or enable) them in ; your user Mercurial.ini file, where USERNAME is your Windows user name: ; ; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini ; Vista or later - C:\Users\USERNAME\Mercurial.ini [ui] ; editor used to enter commit logs, etc. Most text editors will work. editor = notepad ; show changed files and be a bit more verbose if True ; verbose = True ; username data to appear in commits ; it usually takes the form: Joe User <joe.user@host.com> ; username = Joe User <j.user@example.com> ; In order to push/pull over ssh you must specify an ssh tool ;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2 ;ssh = C:\cygwin\bin\ssh ; ; For more information about mercurial extensions, start here ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions ; ; Extensions shipped with Mercurial ; [extensions] ;acl = ;alias = ;bookmarks = ;bugzilla = ;children = ;churn = ;color = ;convert = ;extdiff = ;fetch = ;gpg = ;graphlog = ;hgcia = ;hgk = ;highlight = ;interhg = ;keyword = ;mq = ;notify = ;pager = ;parentrevspec = ;patchbomb = ;purge = ;rebase = ;record = ;transplant = ;win32mbcs = ;win32text = ;zeroconf = ; To use cleverencode/cleverdecode, you must enable win32text extension [encode] ; Encode files that don't contain NUL characters. ; ** = cleverencode: ; Alternatively, you can explicitly specify each file extension that ; you want encoded (any you omit will be left untouched), like this: ; *.txt = dumbencode: [decode] ; Decode files that don't contain NUL characters. ; ** = cleverdecode: ; Alternatively, you can explicitly specify each file extension that ; you want decoded (any you omit will be left untouched), like this: ; **.txt = dumbdecode: [patch] ; If you enable win32text filtering, you will want to enable this ; line as well to allow patching to work correctly. ; eol = crlf ; ; Define external diff commands ; [extdiff] ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe ;cmd.vimdiff = gvim.exe ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)' [hgk] ; Replace the following with your path to hgk, uncomment it and ; install ActiveTcl (or another win32 port like tclkit) ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl" ; vdiff=vdiff ; ; The git extended diff format can represent binary files, file ; permission changes, and rename information that the normal patch format ; cannot describe. However it is also not compatible with tools which ; expect normal patches. so enable git patches at your own risk. ; [diff] ;git = false ;nodates = false # Some default global settings for common merge tools [merge-tools] kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output kdiff3.regkey=Software\KDiff3 kdiff3.regappend=\kdiff3.exe kdiff3.fixeol=True kdiff3.gui=True gvimdiff.args=--nofork -d -g -O $local $other $base gvimdiff.regkey=Software\Vim\GVim 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 diffmerge.checkchanged=True 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 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output tortoisemerge.regkey=Software\TortoiseSVN tortoisemerge.checkchanged=True 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 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge filemerge.args=-left $other -right $local -ancestor $base -merge $output filemerge.gui=True beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 beyondcompare3.regname=ExePath 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