-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.hgrc
64 lines (52 loc) · 1.41 KB
/
.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
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
[ui]
ignore = ~/.hgignore
interface.chunkselector = text
merge = internal:merge3
mergemarkers = detailed
[diff]
git = True
nobinary = True
[extensions]
color =
extdiff =
# FS Monitor. Requires Watchman.
# https://www.mercurial-scm.org/wiki/FsMonitorExtension
fsmonitor =
graphlog =
hgk =
mq =
purge =
rebase =
record =
showstack = ~/.hgext/showstack.py
[defaults]
# Try to make shelve at least remotely like "git stash", by actually shelving
# deleted files. This also shelves added files, so is not ideal, but at least
# it gets hg closer to a consistent definition of "change". (See `hg shelve
# --help` and `hg stat --help` and the discrepency on whether a deleted file is
# a "change".)
#shelve = --addremove
[extdiff]
cmd.meld =
cmd.diffall = meld
cmd.diffmerge = /usr/local/bin/diffmerge
[merge-tools]
# hg opens all changed files in meld by default. Ugh.
meld.diffargs=--label=$plabel1 $parent --label=$clabel $child
diffmerge.executable = /usr/local/bin/diffmerge
diffmerge.args = --result=$output -t1="Local Version" -t2=$output -t3="Other Version" --caption=$output $local $base $other
diffmerge.binary = False
diffmerge.symlinks = False
diffmerge.gui = True
diffmerge.premerge = True
[pager]
pager = less -FRX
[alias]
# TODO: Add ...:help, ...:doc, and ...:category as appropriate
aliases = config alias
colors = debugcolor
conflicts = resolve -l
wip = commit --secret
[commands]
status.terse = uc
%include ~/.hgrc.local