diff tests/test-unrelated-pull.out @ 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 ffeb2c3a1966
children 122449dd89db 445970ccf57a
line wrap: on
line diff