diff hgmerge @ 2805:90a4181ca9ed

Fix extensions for merge change
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 17:26:09 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff