~/.hgrc

hgrc.txt (text/plain), 1.94 KB, created by Denilson Sá Maia on 2010-08-21 13:24:37 UTC

[extensions]
# http://mercurial.selenic.com/wiki/ConvertExtension
hgext.convert =

# http://mercurial.selenic.com/wiki/GraphlogExtension
hgext.graphlog =

# http://mercurial.selenic.com/wiki/HgkExtension
hgk =

# http://mercurial.selenic.com/wiki/ColorExtension
color =

# PyQt4 interface
# http://mercurial.selenic.com/wiki/CuteHgExtension
#cutehg =

# "fetch" is like "pull -u", followed by "merge" if needed
# http://mercurial.selenic.com/wiki/FetchExtension
hgext.fetch=

# http://mercurial.selenic.com/wiki/RebaseProject
rebase =

# http://mercurial.selenic.com/wiki/WorkingWithSubversion
# http://bitbucket.org/durin42/hgsubversion/wiki/Home
# http://blog.red-bean.com/sussman/?p=116
hgsubversion =

# http://hg-git.github.com/
# COMMENTING OUT THIS LINE FIXES THE ERROR
hggit =

# This command lets you choose which parts of the changes in a working
# directory you'd like to commit.
# http://mercurial.selenic.com/wiki/RecordExtension
hgext.record=

# http://mercurial.selenic.com/wiki/HisteditExtension
# http://bitbucket.org/durin42/histedit/src/
#histedit =

# http://mercurial.selenic.com/wiki/MqExtension
hgext.mq =

[diff]
# Use git extended diff format.
# Recommended by:
# http://mercurial.selenic.com/wiki/EditingHistory#Using_Mercurial_Queues
git = 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

[ui]
username = My Name Here <[e-mail]>
ignore = ~/.hgignore

[merge-tools]
kdiff3.args=--auto --L1 base --L2 our --L3 other $base $local $other -o $output
kdiff3.regkey=Software\KDiff3
kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=True
kdiff3.gui=True
kdiff3.priority=15

# http://stackoverflow.com/questions/685151/completly-manual-mercurial-merge
#kdiff3.premerge=False

meld.gui=True
meld.priority=2

gvimdiff.args=--nofork -d -g -O $local $other $base
gvimdiff.regkey=Software\Vim\GVim
gvimdiff.regname=path
gvimdiff.priority=10