comparison tests/test-merge-commit.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 e7282dede8cd
children 17ed9b9a0d03
comparison
equal deleted inserted replaced
4877:242026115e6a 4878:372d93f03d3a