upstream/mercurial-mirror Commit - r7385:8119c1a6

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=-10

17

18

gpyfm.gui=True

18

gpyfm.gui=True

19

20

meld.gui=True

20

meld.gui=True

21

22

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

22

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

23

tkdiff.gui=True

23

tkdiff.gui=True

24

tkdiff.priority=-8

24

tkdiff.priority=-8

25

26

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

26

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

27

xxdiff.gui=True

27

xxdiff.gui=True

28

xxdiff.priority=-8

28

xxdiff.priority=-8

29

30

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

30

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

31

diffmerge.checkchanged=True

31

diffmerge.checkchanged=True

32

diffmerge.gui=True

32

diffmerge.gui=True

33

34

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

34

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

35

p4merge.regkey=Software\Perforce\Environment

35

p4merge.regkey=Software\Perforce\Environment

36

p4merge.regname=P4INSTROOT

36

p4merge.regname=P4INSTROOT

37

p4merge.regappend=\p4merge.exe

37

p4merge.regappend=\p4merge.exe

38

p4merge.gui=True

38

p4merge.gui=True

39

p4merge.priority=-8

39

p4merge.priority=-8

40

41

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

41

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

42

tortoisemerge.regkey=Software\TortoiseSVN

42

tortoisemerge.regkey=Software\TortoiseSVN

43

tortoisemerge.gui=True

43

tortoisemerge.gui=True

44

45

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

45

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

46

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

46

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

47

ecmerge.gui=True

47

ecmerge.gui=True

48

49

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

49

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

50

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

50

filemerge.gui=True

51

filemerge.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
             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: $output /mine:$local /theirs:$other /merged:$output
             tortoisemerge.regkey=Software\TortoiseSVN
             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