Mercurial > hg
view tests/test-merge-force.out @ 8166:56719b1aa6f4
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 26 Apr 2009 11:49:17 +0200 |
parents | 4b0c9c674707 |
children | 3682a19bb637 |
line wrap: on
line source
created new head % local deleted a file, remote removed abort: outstanding uncommitted changes resolving manifests removing a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) % should show a as removed R a % manifest. should not have a: b