Merge branch 'master' of ssh://git.code.sf.net/p/foam-extend/foam-extend-3.2
[foam-extend-3.2.git] / vagrantSandbox / skel / .hgrc
blob63dc7a0b0d1da8a69c0dbc77d13fa1f6636643be
1 [ui]
2 merge = emacs
3 editor = emacs
5 [extensions]
6 color =
7 fetch =
8 graphlog =
9 hgk =
10 keyword =
11 pager =
12 transplant =
13 purge =
14 rebase =
15 bookmarks =
16 extdiff =
17 interhg =
18 highlight =
19 progress =
21 [diff]
22 git=1
23 nodates=1
25 [pager]
26 pager = LESS='FSRX' less
27 attend = help,annotate, cat, diff, export, glog, log, qdiff, incoming, outgoing,interdiff,slog,rlog
29 [merge-tools]
30 emacs.args = -q --eval "(require 'ediff)" --eval "(setq ediff-window-setup-function 'ediff-setup-windows-plain)" --eval "(add-hook 'ediff-quit-hook 'save-buffers-kill-emacs)" --eval "(ediff-merge-with-ancestor \""$local"\" \""$other"\" \""$base"\" nil \""$output"\")"
32 [alias]
33 slog = log --template '{rev}:{node|short} {date|age} {author|email}: {desc|firstline}\n'
34 rlog = log -r : --template '{rev}:{node|short} {date|shortdate} {author|user}:       Statistics: {diffstat}\n{desc}\n\n'