dotfiles / hg / .hgrc

[ui]
username = OJ Reeves <oj@buffered.io>
editor = vim
merge = diffmerge

[merge-tools]
diffmerge.executable = /usr/bin/diffmerge
diffmerge.binary = False
diffmerge.args = --result=$output -t1="Local Version" -t2=$output -t3="Other Version" --caption=$output  $local $base $other
diffmerge.symlinks = False
diffmerge.gui = True
diffmerge.premerge = True

[extdiff]
cmd.diffmerge = /usr/bin/diffmerge

[defaults]
addremove = -s 100
glog = -l10 --style /home/oj/.hg-map-cmdline.sglog
log = -l5 --style /home/oj/.hg-map-cmdline.nlog

[extensions]
hgext.extdiff =
hgext.patchbomb =
hgext.convert =
hgext.bookmarks =
hgext.mq =
hgext.graphlog =
hgext.purge =
hgext.color =
prompt = /home/oj/code/hg-prompt/prompt.py

[diff]
git=1

[alias]
qstatus = status --rev -2:.
bpush = push --rev 
dm = diffmerge
. = glog -l10 --style /home/oj/.hg-map-cmdline.sglog
bu = update -C
s = status

[color]
status.modified = yellow

[web]
cacerts = /etc/ssl/certs/ca-certificates.crt
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.