Mercurial > hg
view tests/test-issue612.out @ 6472:8c4cd80afd3e
mq: add --force option to strip
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Fri, 04 Apr 2008 17:44:31 +0200 |
parents | 4b0c9c674707 |
children | 368a4ec603cc |
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 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