diff tests/test-alias.out @ 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 8a5d8fb59ed2
children a0104303f400
line wrap: on
line diff