Mercurial > hg
view tests/test-merge-force.out @ 7226:b71a52f101dc
Make it possible to disable filtering for a pattern.
Rationale: Apparently there were no way to disable for example win32text extension locally.
RFC: Can it already be done another way?
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 14 Oct 2008 21:28:49 +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