comparison .hgignore @ 96:fce47326677c

Add updated merge3 code
author mpm@selenic.com
date Wed, 18 May 2005 16:45:44 -0800
parents 4a6ab4d80dc4
children ca39b80cbe15
comparison
equal deleted inserted replaced
95:589f507bb259 96:fce47326677c