upstream/mercurial-mirror Commit - r23968:6564ec38

7

kdiff3.regappend=\kdiff3.exe

7

kdiff3.regappend=\kdiff3.exe

8

kdiff3.fixeol=True

8

kdiff3.fixeol=True

9

kdiff3.gui=True

9

kdiff3.gui=True

10

kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child

10

kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child

11

12

gvimdiff.args=--nofork -d -g -O $local $other $base

12

gvimdiff.args=--nofork -d -g -O $local $other $base

13

gvimdiff.regkey=Software\Vim\GVim

13

gvimdiff.regkey=Software\Vim\GVim

28

meld.gui=True

28

meld.gui=True

29

meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output

29

meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output

30

meld.check=changed

30

meld.check=changed

31

meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child

31

meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child

32

33

tkdiff.args=$local $other -a $base -o $output

33

tkdiff.args=$local $other -a $base -o $output

34

tkdiff.gui=True

34

tkdiff.gui=True

35

tkdiff.priority=-8

35

tkdiff.priority=-8

36

tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child

36

tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child

37

38

xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other

38

xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other

39

xxdiff.gui=True

39

xxdiff.gui=True

40

xxdiff.priority=-8

40

xxdiff.priority=-8

41

xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child

41

xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child

42

43

diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\

43

diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\

44

diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\

44

diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\

47

diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output

47

diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output

48

diffmerge.check=changed

48

diffmerge.check=changed

49

diffmerge.gui=True

49

diffmerge.gui=True

50

diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child

50

diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child

51

52

p4merge.args=$base $local $other $output

52

p4merge.args=$base $local $other $output

53

p4merge.regkey=Software\Perforce\Environment

53

p4merge.regkey=Software\Perforce\Environment

70

tortoisemerge.check=changed

70

tortoisemerge.check=changed

71

tortoisemerge.gui=True

71

tortoisemerge.gui=True

72

tortoisemerge.priority=-8

72

tortoisemerge.priority=-8

73

tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'

73

tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel

74

75

ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output

75

ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output

76

ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge

76

ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge

77

ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge

77

ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge

78

ecmerge.gui=True

78

ecmerge.gui=True

79

ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'

79

ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel

80

81

# editmerge is a small script shipped in contrib.

81

# editmerge is a small script shipped in contrib.

82

# It needs this config otherwise it behaves the same as internal:local

82

# It needs this config otherwise it behaves the same as internal:local

94

beyondcompare3.regname=ExePath

94

beyondcompare3.regname=ExePath

95

beyondcompare3.gui=True

95

beyondcompare3.gui=True

96

beyondcompare3.priority=-2

96

beyondcompare3.priority=-2

97

beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child

97

beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child

98

99

; Linux version of Beyond Compare

99

; Linux version of Beyond Compare

100

bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo

100

bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo

101

bcompare.gui=True

101

bcompare.gui=True

102

bcompare.priority=-1

102

bcompare.priority=-1

103

bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child

103

bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child

104

105

winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output

105

winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output

106

winmerge.regkey=Software\Thingamahoochie\WinMerge

106

winmerge.regkey=Software\Thingamahoochie\WinMerge

109

winmerge.check=changed

109

winmerge.check=changed

110

winmerge.gui=True

110

winmerge.gui=True

111

winmerge.priority=-10

111

winmerge.priority=-10

112

winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child

112

winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child

113

114

araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR

114

araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR

115

araxis.regappend=\ConsoleCompare.exe

115

araxis.regappend=\ConsoleCompare.exe

118

araxis.checkconflict=True

118

araxis.checkconflict=True

119

araxis.binary=True

119

araxis.binary=True

120

araxis.gui=True

120

araxis.gui=True

121

araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child

121

araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child

122

123

diffuse.priority=-3

123

diffuse.priority=-3

124

diffuse.args=$local $base $other

124

diffuse.args=$local $base $other

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             kdiff3.regappend=\kdiff3.exe
             kdiff3.fixeol=True
             kdiff3.gui=True
-            kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
+            kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child
             gvimdiff.args=--nofork -d -g -O $local $other $base
             gvimdiff.regkey=Software\Vim\GVim
             meld.gui=True
             meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output
             meld.check=changed
-            meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
+            meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
             tkdiff.args=$local $other -a $base -o $output
             tkdiff.gui=True
             tkdiff.priority=-8
-            tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child
+            tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child
             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
-            xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child
+            xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child
             diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
             diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
             diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
             diffmerge.check=changed
             diffmerge.gui=True
-            diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child
+            diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
             p4merge.args=$base $local $other $output
             p4merge.regkey=Software\Perforce\Environment
             tortoisemerge.check=changed
             tortoisemerge.gui=True
             tortoisemerge.priority=-8
-            tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'
+            tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel
             ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
             ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
             ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
             ecmerge.gui=True
-            ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
+            ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel
             # editmerge is a small script shipped in contrib.
             # It needs this config otherwise it behaves the same as internal:local
             beyondcompare3.regname=ExePath
             beyondcompare3.gui=True
             beyondcompare3.priority=-2
-            beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
+            beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
             ; 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.gui=True
             bcompare.priority=-1
-            bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child
+            bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
             winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
             winmerge.regkey=Software\Thingamahoochie\WinMerge
             winmerge.check=changed
             winmerge.gui=True
             winmerge.priority=-10
-            winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child
+            winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child
             araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
             araxis.regappend=\ConsoleCompare.exe
             araxis.checkconflict=True
             araxis.binary=True
             araxis.gui=True
-            araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child
+            araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child
             diffuse.priority=-3
             diffuse.args=$local $base $other