[extensions]
# Confusingly, listing an extension here (even with no arguments) turns it on
#graphviz = ~/.mercurial/extensions/graphviz.py
color =
hgext.extdiff = 
hgext.mq =
hgext.graphlog = 
# Attic and record are used for 'shelve'
attic = ~/.mercurial/extensions/hgattic/attic.py
hgext.record =
#shelve = ~/.mercurial/extensions/hgshelve/hgshelve.py
info = ~/.mercurial/extensions/info.py
rebase =
#hgsubversion = 
#hgext.hg-git = ~/.mercurial/extensions/hg-git
hgext.bookmarks =
transplant =
#hgext.zeroconf =
#hgext.convert=

[extdiff]
# add new command that runs GNU diff(1) in 'context diff' mode
cmd.cdiff = diff
opts.cdiff = -Npr -C5

# Open the mac diffing utility
cmd.macdiff = 

# add new command called vimdiff, runs vimdiff with DirDiff plugin
# (see http://www.vim.org/scripts/script.php?script_id=102)
#opts.vimdiff = -f '+next' '+execute "DirDiff" argv(0) argv(1)'
# For now, just use normal vimdifff
cmd.vimdiff = vimdiff

[ui]
username = David Wolever <david@wolever.net>
merge = vimdiff

[merge-tools]
macdiff.args = $local $other -ancestor $base -merge $output

[alias]
conflicts = resolve -l
resolved = resolve -m
diff = diff --git
mark = bookmark
stash = shelve -i
renames = stat -Ca
pup = pull --update

[color]
diff.trailingwhitespace = none
#qseries.unapplied = blue bold