Skip to content

Instantly share code, notes, and snippets.

@ourmaninamsterdam
Last active September 26, 2017 14:29
Show Gist options
  • Save ourmaninamsterdam/3c33bbbcf7f88e0c6e95 to your computer and use it in GitHub Desktop.
Save ourmaninamsterdam/3c33bbbcf7f88e0c6e95 to your computer and use it in GitHub Desktop.
My Mercurial setup
# example user config (see "hg help config" for more info)
[ui]
# name and email, e.g.
username =
#username =
merge = diffmerge
editor = /usr/bin/vim
[extensions]
# uncomment these lines to enable some popular extensions
# (see "hg help extensions" for more info)
#
pager =
progress =
color =
graphlog =
fetch =
bookmarks =
record =
hgext.extdiff =
shelve =
strip =
purge =
transplant =
[extdiff]
cmd.diffmerge = /usr/local/bin/diffmerge
[merge-tools]
diffmerge.executable = /usr/local/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
[color]
status.modified = magenta bold
status.added = green bold
status.removed = red bold
status.deleted = cyan bold
status.unknown = blue bold
status.ignored = black bold
[alias]
lga = glog --style=/Users//map-cmdline.lg
lgl = log -b .
[patch]
eol = auto
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment