comparison .gitignore @ 106751:d94786c1fa6c

(vc-bzr-after-dir-status): Ignore pending merges.
author Dan Nicolaescu <dann@ics.uci.edu>
date Wed, 06 Jan 2010 07:11:52 -0800
parents 9a2d92bd2a3e
children 6719c75fa3ac
comparison
equal deleted inserted replaced
106747:47e4680680fe 106751:d94786c1fa6c