upstream/mercurial-mirror Commit - r11147:bdc8f048

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

10

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

10

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

11

gvimdiff.regkey=Software\Vim\GVim

11

gvimdiff.regkey=Software\Vim\GVim

12

gvimdiff.regname=path

12

gvimdiff.regname=path

13

gvimdiff.priority=-9

13

gvimdiff.priority=-9

14

15

merge.checkconflicts=True

15

merge.checkconflicts=True

16

merge.priority=-10

16

merge.priority=-100

17

18

gpyfm.gui=True

18

gpyfm.gui=True

19

20

meld.gui=True

20

meld.gui=True

21

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

21

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

22

23

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

23

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

24

tkdiff.gui=True

24

tkdiff.gui=True

25

tkdiff.priority=-8

25

tkdiff.priority=-8

26

27

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

27

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

28

xxdiff.gui=True

28

xxdiff.gui=True

29

xxdiff.priority=-8

29

xxdiff.priority=-8

30

31

diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\

31

diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\

32

diffmerge.regname=Location

32

diffmerge.regname=Location

33

diffmerge.priority=-7

33

diffmerge.priority=-7

34

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

34

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

35

diffmerge.checkchanged=True

35

diffmerge.checkchanged=True

36

diffmerge.gui=True

36

diffmerge.gui=True

37

38

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

38

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

39

p4merge.regkey=Software\Perforce\Environment

39

p4merge.regkey=Software\Perforce\Environment

40

p4merge.regname=P4INSTROOT

40

p4merge.regname=P4INSTROOT

41

p4merge.regappend=\p4merge.exe

41

p4merge.regappend=\p4merge.exe

42

p4merge.gui=True

42

p4merge.gui=True

43

p4merge.priority=-8

43

p4merge.priority=-8

44

45

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

45

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

46

tortoisemerge.regkey=Software\TortoiseSVN

46

tortoisemerge.regkey=Software\TortoiseSVN

47

tortoisemerge.checkchanged=True

47

tortoisemerge.checkchanged=True

48

tortoisemerge.gui=True

48

tortoisemerge.gui=True

49

tortoisemerge.priority=-8

49

tortoisemerge.priority=-8

50

51

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

51

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

52

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

52

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

53

ecmerge.gui=True

53

ecmerge.gui=True

54

55

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

55

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

56

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

56

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

57

filemerge.gui=True

57

filemerge.gui=True

58

59

; Windows version of Beyond Compare

59

; Windows version of Beyond Compare

60

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

60

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

61

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

61

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

62

beyondcompare3.regname=ExePath

62

beyondcompare3.regname=ExePath

63

beyondcompare3.gui=True

63

beyondcompare3.gui=True

64

beyondcompare3.priority=-2

64

beyondcompare3.priority=-2

65

66

; Linux version of Beyond Compare

66

; Linux version of Beyond Compare

67

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

67

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

68

bcompare.premerge=False

68

bcompare.premerge=False

69

bcompare.gui=True

69

bcompare.gui=True

70

bcompare.priority=-1

70

bcompare.priority=-1

71

72

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

72

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

73

winmerge.regkey=Software\Thingamahoochie\WinMerge

73

winmerge.regkey=Software\Thingamahoochie\WinMerge

74

winmerge.regname=Executable

74

winmerge.regname=Executable

75

winmerge.checkchanged=True

75

winmerge.checkchanged=True

76

winmerge.gui=True

76

winmerge.gui=True

77

winmerge.priority=-10

77

winmerge.priority=-10

78

79

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

79

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

80

araxis.regappend=\ConsoleCompare.exe

80

araxis.regappend=\ConsoleCompare.exe

81

araxis.priority=-2

81

araxis.priority=-2

82

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

82

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

83

araxis.premerge=False

83

araxis.premerge=False

84

araxis.checkconflict=True

84

araxis.checkconflict=True

85

araxis.binary=True

85

araxis.binary=True

86

araxis.gui=True

86

araxis.gui=True

	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
             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
+            merge.priority=-100
             gpyfm.gui=True
             meld.gui=True
             meld.args=--label='local' $local --label='base' $base --label='other' $other
             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.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
             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
             tortoisemerge.priority=-8
             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
             ; 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
             ; 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
             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
             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