tests/test-issue612.out
author Martin Geisler <mg@daimi.au.dk>
Tue, 24 Feb 2009 18:09:16 +0100
changeset 7801 e5627562b9f2
parent 6512 368a4ec603cc
permissions -rw-r--r--
setup: run hg with empty HGRCPATH for robustness. Otherwise a bad hgrc file can make the version detection fail.

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
? src/a.o
merging src/a.c and source/a.c to 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