.ackrc @ 35b42a555d52

Remove merge tools.
author Steve Losh <steve@stevelosh.com>
date Mon, 18 Jan 2010 18:58:32 -0500
parents 02af70beae80
children 1a3ee92103ed
--type-set
log=.log
--type-set
django=.py,.html