diff tests/test-merge-default.out @ 4878:372d93f03d3a

diff: correctly handle combinations of whitespace options
author Matt Mackall <mpm@selenic.com>
date Sat, 14 Jul 2007 12:44:47 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff