diff tests/test-bad-pull @ 1664:4338e33c973b

Safer version of FileMerge merge
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Jan 2006 12:02:12 +1300
parents 0902ffece4b4
children 397b62d5dd13
line wrap: on
line diff