Mercurial > hg

view tests/test-issue612.out @ 11531:59bd20451ab6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: re-add patches to mq repo after rebase Since 1b82a26635d7, we are adding patches after the qimport call, and not inside it anymore. Correct updatemq to match the new behaviour.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Tue, 13 Jul 2010 20:12:32 +0900
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