forked from robertkluin/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
hgrc
37 lines (30 loc) · 876 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
28
29
30
31
32
33
34
35
36
[ui]
username = Robert Kluin <[email protected]>
editor = vim
ignore=~/.hgignore_global
[diff]
git = True
[extensions]
hgext.convert =
hgext.graphlog =
bookmarks =
rebase =
mq =
#mksqlscript = ~/.hgext/mksqlscript/mksqlscript.py
#hgsubversion = ~/.hgext/hgsubversion/hgsubversion
[web]
cacerts = /etc/hg-dummy-cert.pem
[merge-tools]
sourcetreemerge.gui=False
sourcetreebulkmerge.gui=False
sourcetreemerge.binary=False
sourcetreebulkmerge.executable=/Applications/SourceTree.app/Contents/Resources/hg-merge.sh
sourcetreemerge.args=$local $other -ancestor $base -merge $output
sourcetreemerge.checkconflicts=True
sourcetreemerge.premerge=True
sourcetreemerge.executable=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh
sourcetreebulkmerge.premerge=False
sourcetreebulkmerge.binary=True
[extdiff]
cmd.sourcetreediff=opendiff
opts.sourcetreediff=