tests/test-issue612.out
author Jesse Glick <jesse.glick@sun.com>
Thu, 20 Dec 2007 07:46:47 -0800
changeset 5678 d3909674fcea
parent 5610 2493a478f395
child 6336 4b0c9c674707
permissions -rw-r--r--
man 5 hgrc implied you need to use external tools to do CRLF translation. This is no longer true; win32text provides a much better in-process alternative.

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
? src/a.o
merging src/a.c and source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o