Mercurial > hg

view tests/test-issue612.out @ 11040:8f951ed6c63c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: add --view switch to use external diff viewer
author Matt Mackall <mpm@selenic.com>
date Thu, 29 Apr 2010 22:04:05 -0500
parents 368a4ec603cc
children
line wrap: on
line source

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