upstream/mercurial-mirror Commit - r46783:24ee0c7e

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

5

; The Araxis Merge tool is configured to work with newer versions of Araxis Merge

6

; if you are using Araxis Merge 2008 or earlier, create a [merge-tools] section

7

; in your mercurial.ini file, and add one of the two following "araxis.executable"

8

; lines, depending on whether you have installed a 32 or a 64 bit version

9

; of Araxis Merge and whether you are on a 32 or 64 bit version of windows

10

;

11

;araxis.executable=${ProgramFiles}/Araxis/Araxis Merge/ConsoleCompare.exe

12

;araxis.executable=${ProgramFiles(x86)}/Araxis/Araxis Merge/ConsoleCompare.exe

13

;

14

; Please remember to remove the leading ";" to uncomment the line

15

;

4

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

16

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

5

araxis.binary=True

17

araxis.binary=True

6

araxis.checkconflict=True

18

araxis.checkconflict=True

10

araxis.regappend=\ConsoleCompare.exe

22

araxis.regappend=\ConsoleCompare.exe

11

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

23

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

12

24

13

; Linux version of Beyond Compare

25

; Linux version of BeyondCompare 3 and 4 (dirdiff is version 4 only)

14

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

26

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

15

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

27

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

16

bcompare.gui=True

28

bcompare.gui=True

23

bcomposx.gui=True

35

bcomposx.gui=True

24

bcomposx.priority=-1

36

bcomposx.priority=-1

25

37

26

; Windows version of Beyond Compare

38

; Windows version of BeyondCompare 3

27

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

39

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

28

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

40

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

29

beyondcompare3.gui=True

41

beyondcompare3.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]
+            ; The Araxis Merge tool is configured to work with newer versions of Araxis Merge
+            ; if you are using Araxis Merge 2008 or earlier, create a [merge-tools] section
+            ; in your mercurial.ini file, and add one of the two following "araxis.executable"
+            ; lines, depending on whether you have installed a 32 or a 64 bit version
+            ; of Araxis Merge and whether you are on a 32 or 64 bit version of windows
+            ;
+            ;araxis.executable=${ProgramFiles}/Araxis/Araxis Merge/ConsoleCompare.exe
+            ;araxis.executable=${ProgramFiles(x86)}/Araxis/Araxis Merge/ConsoleCompare.exe
+            ;
+            ; Please remember to remove the leading ";" to uncomment the line
+            ;
             araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
             araxis.binary=True
             araxis.checkconflict=True
             araxis.regappend=\ConsoleCompare.exe
             araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
-            ; Linux version of Beyond Compare
+            ; Linux version of BeyondCompare 3 and 4 (dirdiff is version 4 only)
             bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo
             bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
             bcompare.gui=True
             bcomposx.gui=True
             bcomposx.priority=-1
-            ; Windows version of Beyond Compare
+            ; Windows version of BeyondCompare 3
             beyondcompare3.args=$local $other $base $output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /automerge /reviewconflicts /solo
             beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
             beyondcompare3.gui=True