forked from kevinrenskers/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.hgrc
27 lines (23 loc) · 811 Bytes
/
.hgrc
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
[ui]
ignore = ~/.hgignore
[extensions]
hgext.fetch=
hgext.extdiff=
hgext.progress=
hgext.graphlog=
[diff]
ignoreblanklines = true
[extdiff]
cmd.sourcetreediff= / Applications/DiffMerge.app/Contents/MacOS/DiffMerge
opts.sourcetreediff = --nosplash
[merge-tools]
sourcetreemerge.gui = False
sourcetreebulkmerge.gui = False
sourcetreemerge.binary = False
sourcetreebulkmerge.executable = /Applications/SourceTree.app/Contents/Resources/hg-merge.sh
sourcetreemerge.args = --merge --result=$output -t1="Local Version" -t2=$output -t3="Other Version" --caption=$output $local $base $other
sourcetreemerge.checkconflicts = True
sourcetreemerge.premerge = True
sourcetreemerge.executable = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge
sourcetreebulkmerge.premerge = False
sourcetreebulkmerge.binary = True