diff hgmerge @ 3626:02e9355c3420

tests: add -i switch Prompt to accept changes for tests where output changed
author Matt Mackall <mpm@selenic.com>
date Wed, 08 Nov 2006 13:20:08 -0600
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff