view tests/test-merge-force.out @ 8798:92fc57c9f9d1

remoteui: properly create dst with copy()
author Matt Mackall <mpm@selenic.com>
date Fri, 12 Jun 2009 02:19:51 -0500
parents 3682a19bb637
children
line wrap: on
line source

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes (use 'hg status' to list 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