Skip to content

Instantly share code, notes, and snippets.

@h-lame
Created December 3, 2013 19:22
Show Gist options
  • Save h-lame/7775881 to your computer and use it in GitHub Desktop.
Save h-lame/7775881 to your computer and use it in GitHub Desktop.
My hgrc, with these plugins and options I basically replicated a close to git workflow.
[ui]
verbose = True
merge = diffmerge
[pager]
pager = LESS='FSRX' less
[extensions]
pager =
color =
fetch =
hgext.record=
hgext.purge=
hgext.shelve=~/.hgext/hgshelve/hgshelve.py
hgext.extdiff =
[extdiff]
cmd.diffmerge = ~/bin/diffmerge
[merge-tools]
diffmerge.executable = ~/bin/diffmerge
diffmerge.args = -merge -result=$output -t1="Local Version" -t2=$output -t3="Other Version" -caption=$output $local $base $other
diffmerge.binary = False
diffmerge.symlinks = False
diffmerge.gui = True
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment