tests/test-586.out
author Jesse Glick <jesse.glick@sun.com>
Thu, 20 Dec 2007 07:46:47 -0800
changeset 5678 d3909674fcea
parent 4535 720ae5085ee3
child 5762 c2a21fe60994
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 a
adding b
pulling from ../a
searching for changes
warning: repository is unrelated
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
C b