Mercurial > hg

view tests/test-issue612.out @ 10908:816bac2f9452 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
prepush: fix bug in warning message selection In certain situations you would be told "you should pull and merge" even when there is nothing to pull.
author Sune Foldager <cryo@cyanite.org>
date Wed, 14 Apr 2010 19:11:35 +0200
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