nsd-dynipwatch: touch watchfile before inotify'ing
[shutils.git] / dotfiles / hg / hgrc
1 [ui]
2 username = First Last <me@example.com>
3 merge = gvimdiff
4 editor = vim
5
6 [merge-tools]
7 splice.executable = gvim
8 splice.args = -f $base $local $other $output -c 'SpliceInit'
9 splice.premerge = keep
10 splice.priority = 1
11
12 [web]
13 cacerts =
14
15 [auth]
16
17 [hostfingerprints]
18
19 [extensions]
20 color =
21 pager =
22 transplant =
23 rebase =
24 hgext.mq =
25 hgext.patchbomb =
26 graphlog =
27 hgext.extdiff =
28 fetch =
29 hgext.hgshelve = ~/.hgext/hgshelve.py
30
31 [pager]
32 pager = LESS='FSRX' less
33 #quiet = True
34 #attend = diff,status,log,glog
35
36 [diff]
37 git = True
38
39 [extdiff]
40 # if cwdiff is in your path, otherwise set to wherever you've installed cwdiff
41 cmd.wdiff = cwdiff
42 #add --no-color below, if you dislike colors!
43 opts.wdiff = --diff --ab
44
45