Mercurial > hg

comparison tests/test-merge9.out @ 6005:3c33032d8906

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5af5f0f9d724
children 4b0c9c674707
comparison
equal deleted inserted replaced
6004:5af5f0f9d724 6005:3c33032d8906