diff tests/test-merge7.out @ 1728:9b92b71d5dd7

add -w and -p options to diff. this is for issue 126.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 15 Feb 2006 10:39:47 -0800
parents bf6c91cb816f
children 6d50d6189269
line wrap: on
line diff