.ackrc @ 97bf431de3e6

Add filemerge as a merge tool.
author Steve Losh <steve@stevelosh.com>
date Sun, 10 Jan 2010 18:01:10 -0500
parents 02af70beae80
children 1a3ee92103ed
--type-set
log=.log
--type-set
django=.py,.html