diff tests/test-merge7.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 92ccccb55ba3
children 9fe7e6acf525
line wrap: on
line diff