diff tests/test-merge-prompt.out @ 7635:d22c43724745

kill imerge.py It's been broken for a while.
author Matt Mackall <mpm@selenic.com>
date Sun, 11 Jan 2009 23:00:09 -0600
parents 4b0c9c674707
children 01ada7b1861d
line wrap: on
line diff