diff tests/test-merge1 @ 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 ccfe423d3d0a
children
line wrap: on
line diff