diff tests/test-bundle @ 6005:3c33032d8906

merge: add support for tool EOL fixups specified with merge-tools:<tool>.fixeol=True
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Feb 2008 19:29:05 -0600
parents da72b4d24797
children b3286a92f4bc
line wrap: on
line diff