Mercurial > hg

view tests/test-issue612.out @ 5660:3c80ecdc1bcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use VISUAL in addition to EDITOR when choosing the editor to use.
author Osku Salerma <osku@iki.fi>
date Wed, 05 Dec 2007 20:40:01 +0900
parents 2493a478f395
children 4b0c9c674707
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
? 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