diff tests/test-hgignore.out @ 3001:ad558f297eb1

merge: simplify some update logic
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:47:27 -0500
parents 0d36e3d7e2ea
children 4e521a3ee5eb
line wrap: on
line diff