.hgrc

[ui]
username=Steven Merrill <steven.merrill@gmail.com>
merge = diffmerge
extdiff = diffmerge

ignore=~smerrill/.hgignore_global

[extensions]
hgext.bookmarks =
# Run 'easy_install hg-git' if this errors out.
hggit =
hgext.fetch=
hgext.convert=
hgext.mq=
hgext.extdiff=
hgext.purge=
#hgshelve=~/.mercurial/hgshelve.py
shelve=
prompt=~/.mercurial/prompt.py
color=
hgext.eol =
mercurial_keyring =

[repository]
native = LF

[eol]
only-consistent = False

[extdiff]
cmd.diffmerge = /usr/bin/diffmerge
mvimdiff = /usr/local/bin/mvimdiff -df

cmd.sourcetreediff=opendiff
opts.sourcetreediff=
[merge-tools]
diffmerge.executable = /usr/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

sourcetreemerge.gui=False
sourcetreebulkmerge.gui=False
sourcetreemerge.binary=False
sourcetreebulkmerge.executable=/Applications/SourceTree.app/Contents/Resources/hg-merge.sh
sourcetreemerge.args=$local $other -ancestor $base -merge $output
sourcetreemerge.checkconflicts=True
sourcetreemerge.premerge=True
sourcetreemerge.executable=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh
sourcetreebulkmerge.premerge=False
sourcetreebulkmerge.binary=True
[paths]

[defaults]
push = --new-branch
diff = --git 

[alias]
changelog = outgoing --no-merges --template "Revision {node|short} by {author} on {date|shortdate}:\n{desc}\n\n"

[web]
cacerts = ~/.mercurial/dummycert.pem