upstream/mercurial-mirror Commit - r11506:48e549d7

1

# Some default global settings for common merge tools

1

# Some default global settings for common merge tools

2

3

[merge-tools]

3

[merge-tools]

4

kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output

4

kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output

5

kdiff3.regkey=Software\KDiff3

5

kdiff3.regkey=Software\KDiff3

6

kdiff3.regappend=\kdiff3.exe

6

kdiff3.regappend=\kdiff3.exe

7

kdiff3.fixeol=True

7

kdiff3.fixeol=True

8

kdiff3.gui=True

8

kdiff3.gui=True

9

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

9

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

10

11

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

11

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

12

gvimdiff.regkey=Software\Vim\GVim

12

gvimdiff.regkey=Software\Vim\GVim

13

gvimdiff.regname=path

13

gvimdiff.regname=path

14

gvimdiff.priority=-9

14

gvimdiff.priority=-9

15

16

vimdiff.args=$local $other $base

17

vimdiff.priority=-10

18

16

merge.checkconflicts=True

19

merge.checkconflicts=True

17

merge.priority=-100

20

merge.priority=-100

18

21

19

gpyfm.gui=True

22

gpyfm.gui=True

20

23

21

meld.gui=True

24

meld.gui=True

22

meld.args=--label='local' $local --label='base' $base --label='other' $other

25

meld.args=--label='local' $local --label='base' $base --label='other' $other

23

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

26

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

24

27

25

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

28

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

26

tkdiff.gui=True

29

tkdiff.gui=True

27

tkdiff.priority=-8

30

tkdiff.priority=-8

28

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

31

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

29

32

30

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

33

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

31

xxdiff.gui=True

34

xxdiff.gui=True

32

xxdiff.priority=-8

35

xxdiff.priority=-8

33

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

36

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

34

37

35

diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\

38

diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\

36

diffmerge.regname=Location

39

diffmerge.regname=Location

37

diffmerge.priority=-7

40

diffmerge.priority=-7

38

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

41

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

39

diffmerge.checkchanged=True

42

diffmerge.checkchanged=True

40

diffmerge.gui=True

43

diffmerge.gui=True

41

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

44

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

42

45

43

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

46

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

44

p4merge.regkey=Software\Perforce\Environment

47

p4merge.regkey=Software\Perforce\Environment

45

p4merge.regname=P4INSTROOT

48

p4merge.regname=P4INSTROOT

46

p4merge.regappend=\p4merge.exe

49

p4merge.regappend=\p4merge.exe

47

p4merge.gui=True

50

p4merge.gui=True

48

p4merge.priority=-8

51

p4merge.priority=-8

49

p4merge.diffargs=$parent $child

52

p4merge.diffargs=$parent $child

50

53

51

tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output

54

tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output

52

tortoisemerge.regkey=Software\TortoiseSVN

55

tortoisemerge.regkey=Software\TortoiseSVN

53

tortoisemerge.checkchanged=True

56

tortoisemerge.checkchanged=True

54

tortoisemerge.gui=True

57

tortoisemerge.gui=True

55

tortoisemerge.priority=-8

58

tortoisemerge.priority=-8

56

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

59

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

57

60

58

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

61

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

59

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

62

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

60

ecmerge.gui=True

63

ecmerge.gui=True

61

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

64

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

62

65

63

filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge

66

filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge

64

filemerge.args=-left $other -right $local -ancestor $base -merge $output

67

filemerge.args=-left $other -right $local -ancestor $base -merge $output

65

filemerge.gui=True

68

filemerge.gui=True

66

69

67

; Windows version of Beyond Compare

70

; Windows version of Beyond Compare

68

beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo

71

beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo

69

beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3

72

beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3

70

beyondcompare3.regname=ExePath

73

beyondcompare3.regname=ExePath

71

beyondcompare3.gui=True

74

beyondcompare3.gui=True

72

beyondcompare3.priority=-2

75

beyondcompare3.priority=-2

73

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

76

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

74

77

75

; Linux version of Beyond Compare

78

; Linux version of Beyond Compare

76

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

79

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

77

bcompare.premerge=False

80

bcompare.premerge=False

78

bcompare.gui=True

81

bcompare.gui=True

79

bcompare.priority=-1

82

bcompare.priority=-1

80

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

83

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

81

84

82

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

85

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

83

winmerge.regkey=Software\Thingamahoochie\WinMerge

86

winmerge.regkey=Software\Thingamahoochie\WinMerge

84

winmerge.regname=Executable

87

winmerge.regname=Executable

85

winmerge.checkchanged=True

88

winmerge.checkchanged=True

86

winmerge.gui=True

89

winmerge.gui=True

87

winmerge.priority=-10

90

winmerge.priority=-10

88

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

91

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

89

92

90

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

93

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

91

araxis.regappend=\ConsoleCompare.exe

94

araxis.regappend=\ConsoleCompare.exe

92

araxis.priority=-2

95

araxis.priority=-2

93

araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output

96

araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output

94

araxis.premerge=False

97

araxis.premerge=False

95

araxis.checkconflict=True

98

araxis.checkconflict=True

96

araxis.binary=True

99

araxis.binary=True

97

araxis.gui=True

100

araxis.gui=True

98

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

101

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

99

102

100

diffuse.priority=-3

103

diffuse.priority=-3

101

diffuse.args=$local $base $other

104

diffuse.args=$local $base $other

102

diffuse.gui=True

105

diffuse.gui=True

103

diffuse.diffargs=$parent $child

106

diffuse.diffargs=$parent $child

104

107

105

UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe

108

UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe

106

UltraCompare.args = $base $local $other -title1 base -title3 other

109

UltraCompare.args = $base $local $other -title1 base -title3 other

107

UltraCompare.priority = -2

110

UltraCompare.priority = -2

108

UltraCompare.gui = True

111

UltraCompare.gui = True

109

UltraCompare.binary = True

112

UltraCompare.binary = True

110

UltraCompare.checkconflicts = True

113

UltraCompare.checkconflicts = True

111

UltraCompare.checkchanged = True

114

UltraCompare.checkchanged = True

112

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

115

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

	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

             # 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
             kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
             gvimdiff.args=--nofork -d -g -O $local $other $base
             gvimdiff.regkey=Software\Vim\GVim
             gvimdiff.regname=path
             gvimdiff.priority=-9
+            vimdiff.args=$local $other $base
+            vimdiff.priority=-10
             merge.checkconflicts=True
             merge.priority=-100
             gpyfm.gui=True
             meld.gui=True
             meld.args=--label='local' $local --label='base' $base --label='other' $other
             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
             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
             diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
             diffmerge.regname=Location
             diffmerge.priority=-7
             diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
             diffmerge.checkchanged=True
             diffmerge.gui=True
             diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child
             p4merge.args=$base $local $other $output
             p4merge.regkey=Software\Perforce\Environment
             p4merge.regname=P4INSTROOT
             p4merge.regappend=\p4merge.exe
             p4merge.gui=True
             p4merge.priority=-8
             p4merge.diffargs=$parent $child
             tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
             tortoisemerge.regkey=Software\TortoiseSVN
             tortoisemerge.checkchanged=True
             tortoisemerge.gui=True
             tortoisemerge.priority=-8
             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.gui=True
             ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
             filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
             filemerge.args=-left $other -right $local -ancestor $base -merge $output
             filemerge.gui=True
             ; Windows version of Beyond Compare
             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
             beyondcompare3.priority=-2
             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.premerge=False
             bcompare.gui=True
             bcompare.priority=-1
             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.regname=Executable
             winmerge.checkchanged=True
             winmerge.gui=True
             winmerge.priority=-10
             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.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
             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
             UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
             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