Add filemerge as a merge tool.
author |
Steve Losh <steve@stevelosh.com> |
date |
Sun, 10 Jan 2010 18:01:10 -0500 |
parents |
711219d15b39 |
children |
377ad9ef7931 |
[ui]
username = Steve Losh <steve@stevelosh.com>
editor = mate -w
[extensions]
graphlog =
record =
bookmarks =
rebase =
purge =
mq =
patchbomb =
extdiff =
color =
parentrevspec =
schemes =
hgshelve = ~/lib/hg/hgshelve/hgshelve.py
paste = ~/src/hg-paste/paste.py
prompt = ~/src/hg-prompt/prompt.py
histedit = ~/lib/hg/histedit
hggit = ~/lib/hg/hg-git/hggit
collapse = ~/lib/hg/hgcollapse/hgext/collapse.py
diffstat = ~/lib/hg/hgdiffstat/hgext/diffstat.py
review = ~/src/hg-review/review
[schemes]
webf = ssh://sjl@sjl.webfactional.com/repos/
bbs = ssh://hg@bitbucket.org/
gh = git://github.com/
ghs = git+ssh://git@github.com/
[diff]
git = True
[extdiff]
cmd.fmdiff = fmdiff
[merge-patterns]
** = filemerge
[merge-tools]
filemerge.executable = /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
filemerge.args = -left $other -right $local -ancestor $base -merge $output
filemerge.gui = True
[email]
method = smtp
from = Steve Losh <steve@stevelosh.com>
[smtp]
host = smtp.stevelosh.com
port = 587
username = sjl
tls = True
[web]
allow_archive = gz zip bz2
motd = more info at <a href="http://stevelosh.com/projects/">stevelosh.com/projects</a>
[color]
status.modified = cyan
status.added = green
status.removed = red
status.deleted = yellow bold underline
status.unknown = magenta bold underline
status.ignored = black bold
diff.diffline = none
diff.extended = cyan
diff.file_a = red
diff.file_b = green
diff.hunk = yellow bold
diff.deleted = red
diff.inserted = green
diff.changed = white
diff.trailingwhitespace = white_background
[bookmarks]
track.current = True
[defaults]
diff = --color always
status = --color always
serve = --style=gitweb
rebase = --keepbranches
addremove = --similarity 100
[alias]
nudge = push --rev .
tmd = diff --no-color -U 10
cm = commit -m
st = status -C
? = summary
slog = log --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.slog
. = slog -l15
.. = . -l100000000
, = glog -l10 --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.sglog
,, = , -l100000000
nlog = log --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.nlog
n = nlog -vr
show = nlog -vpr