diff tests/test-diff-ignore-whitespace.out @ 3248:7a0d70b69d74

merge: reorder dirstate update slightly for correctness
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 14:09:26 -0500
parents bdf9d809467c
children 372d93f03d3a
line wrap: on
line diff