Mercurial > hg
view tests/test-merge-force.out @ 10025:fb45c1e4396f stable
cmdutil: copy auth section in remoteui
This allows me to specify an auth section in a .hg/hgrc instead of just
a global or user-level hgrc.
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Thu, 10 Dec 2009 12:31:21 +0100 |
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