Created
September 18, 2012 14:40
-
-
Save hoangtranwork/3743493 to your computer and use it in GitHub Desktop.
setup 2 diff/merge tools (based on file types)
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Generated by TortoiseHg settings dialog | |
[diff] | |
git = True | |
[extensions] | |
mercurial_keyring = | |
[ui] | |
merge = sourcegeardiffmerge | |
username = hoang | |
[tortoisehg] | |
vdiff = sourcegeardiffmerge | |
closeci = True | |
workbench.single = True | |
ui.language = en | |
initialrevision = workingdir | |
[merge-tools] | |
sourcegeardiffmerge.executable=c:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe | |
sourcegeardiffmerge.gui=True | |
sourcegeardiffmerge.diffargs=-nosplash -t1="$plabel1" -t2="$clabel" $parent $child | |
sourcegeardiffmerge.priority=1 | |
sourcegeardiffmerge.diff3args = -t1="LocalVersion" -t2="MergedResult" -t3="OtherVersion" $parent1 $child $parent2 | |
sourcegeardiffmerge.binary = False | |
sourcegeardiffmerge.symlinks = False | |
tortoiseidiff.executable=c:\Program Files\TortoiseSVN\bin\TortoiseIDiff.exe | |
tortoiseidiff.gui=True | |
tortoiseidiff.diffargs=/left:"$parent" /lefttitle:"$plabel1" /right:"$child" /righttitle:"$clabel" /showinfo | |
tortoiseidiff.priority=2 | |
[diff-patterns] | |
**.jpg = tortoiseidiff | |
**.jpeg = tortoiseidiff | |
**.png = tortoiseidiff | |
** = sourcegeardiffmerge | |
[merge-patterns] | |
**.jpg = tortoiseidiff | |
**.jpeg = tortoiseidiff | |
**.png = tortoiseidiff | |
** = sourcegeardiffmerge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment