Mercurial > hg > mercurial

comparison mercurial-tests/testData/bin/Mercurial.ini @ 0:a530ea876f55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial support sources added
author Pavel.Sher
date Mon, 14 Jul 2008 18:22:05 +0400
parents
children 1490e2981799
comparison
equal deleted inserted replaced
-1:000000000000 0:a530ea876f55
1 ; System-wide Mercurial config file. To override these settings on a
2 ; per-user basis, please edit the following file instead, where
3 ; USERNAME is your Windows user name:
4 ; C:\Documents and Settings\USERNAME\Mercurial.ini
5
6 [ui]
7 editor = notepad
8
9 [extensions]
10 ; The win32text extension is available and installed by default. It
11 ; provides built-in Python hooks to perform line ending conversions.
12 ; This is normally much faster than running an external program.
13 hgext.win32text =
14
15
16 [encode]
17 ; Encode files that don't contain NUL characters.
18
19 ; ** = cleverencode:
20
21 ; Alternatively, you can explicitly specify each file extension that
22 ; you want encoded (any you omit will be left untouched), like this:
23
24 ; *.txt = dumbencode:
25
26
27 [decode]
28 ; Decode files that don't contain NUL characters.
29
30 ; ** = cleverdecode:
31
32 ; Alternatively, you can explicitly specify each file extension that
33 ; you want decoded (any you omit will be left untouched), like this:
34
35 ; **.txt = dumbdecode:
36
37 # Some default global settings for common merge tools
38
39 [merge-tools]
40 kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
41 kdiff3.regkey=Software\KDiff3
42 kdiff3.regappend=\kdiff3.exe
43 kdiff3.fixeol=True
44 kdiff3.gui=True
45
46 gvimdiff.args=--nofork -d -g -O $local $other $base
47 gvimdiff.regkey=Software\Vim\GVim
48 gvimdiff.regname=path
49 gvimdiff.priority=-9
50
51 merge.checkconflicts=True
52 merge.priority=-10
53
54 gpyfm.gui=True
55
56 meld.gui=True
57
58 tkdiff.args=$local $other -a $base -o $output
59 tkdiff.gui=True
60 tkdiff.priority=-8
61
62 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
63 xxdiff.gui=True
64 xxdiff.priority=-8
65
66 diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
67 diffmerge.checkchanged=True
68 diffmerge.gui=True
69
70 p4merge.args=$base $local $other $output
71 p4merge.regkey=Software\Perforce\Environment
72 p4merge.regname=P4INSTROOT
73 p4merge.regappend=\p4merge.exe
74 p4merge.gui=True
75 p4merge.priority=-8
76
77 tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output
78 tortoisemerge.regkey=Software\TortoiseSVN
79 tortoisemerge.gui=True
80
81 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
82 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
83 ecmerge.gui=True
84
85 filemerge.args=-left $other -right $local -ancestor $base -merge $output
86 filemerge.gui=True