-
Notifications
You must be signed in to change notification settings - Fork 0
/
.hgrc
39 lines (32 loc) · 1.13 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
editor = /usr/bin/vim -c "r ~/.hgtemplate"
[extensions]
fetch=
rebase=
color=
hgext.graphlog=
hgext.schemes=
hgext.extdiff =
##prompt = /Users/nilcolor/hg-stuff/hg-prompt/prompt.py
[alias]
slog = log --template '{date|shortdate} [{rev}:{node|short}] {author|person}: {desc|firstline}\n' -l 10
sin = incoming --template '{date|shortdate} [{rev}:{node|short}] {author|person}: {desc|firstline}\n'
sout = outgoing --template '{date|shortdate} [{rev}:{node|short}] {author|person}: {desc|firstline}\n'
sheads = heads --template '{date|shortdate} [{rev}:{node|short}] {author|person}: {desc|firstline}\n'
sglog = glog --template '[{rev}:{node|short}] by {author|person} \n{desc|fill68}\n\n'
[diff]
git = True
[ui]
username =
merge = diffmerge
[extdiff]
# cmd.diffmerge = /usr/local/bin/diffmerge
cmd.ksdiff = /usr/local/bin/ksdiff-wrapper
opts.ksdiff = hg
[merge-tools]
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
[schemes]