Mercurial > hg
view tests/test-issue619.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 | cdc458b12f0f |
children | 5b48d819d5f9 |
line wrap: on
line source
adding a marked working directory as branch b adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bogus fast-forward should fail abort: can't merge with ancestor done