tests/test-issue612.out
author Martin Geisler <mg@lazybytes.net>
Thu, 17 Jun 2010 17:21:39 +0300
changeset 11382 2f09b13e914d
parent 6512 368a4ec603cc
permissions -rw-r--r--
help: new revsets topic Based on a patch by timeless which in turn is based on http://selenic.com/pipermail/mercurial-devel/2010-June/021638.html

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