diff tests/test-diffdir @ 768:20e95c245bc3

Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH
author mpm@selenic.com
date Sat, 23 Jul 2005 10:00:56 -0500
parents 7e4843b7efd2
children 6592c4f5cd4f 445970ccf57a
line wrap: on
line diff