diff tests/test-merge5.out @ 8861:90f74b31ed4f

filemerge: fix internal:dump
author Matt Mackall <mpm@selenic.com>
date Sat, 20 Jun 2009 16:42:51 -0500
parents 0b89315d5de2
children 68a1b9d0663e
line wrap: on
line diff