Mercurial > hg
view tests/test-merge2.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 | b2ae81a7df29 |
children | 4b0c9c674707 |
line wrap: on
line source
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b