Skip to content
Find file
Fetching contributors…
Cannot retrieve contributors at this time
30 lines (24 sloc) 617 Bytes
[ui]
verbose = true
merge = Kaleidoscope
[merge-tools]
Kaleidoscope.executable = /usr/local/bin/ksdiff
Kaleidoscope.args = --merge --output $output --base $base -- $local $other
[alias]
nudge = push --rev .
[extensions]
color =
convert =
crecord = ~/.hgext/crecord/crecord
extdiff =
graphlog =
hgflow = ~/.hgext/hgflow/hgflow.py
hgshelve = ~/.hgext/hgshelve/hgshelve.py
histedit = ~/.hgext/histedit/hg_histedit.py
mq =
rebase =
rebaseif = ~/.hgext/ml-hgext/rebaseif.py
transplant =
[extdiff]
cmd.ksdiff = /usr/local/bin/ksdiff
opts.ksdiff = --changeset --wait --filelist
Something went wrong with that request. Please try again.