Mercurial > hg
view tests/test-merge-force.out @ 6994:bf727bab38b9
Use relative imports in inotify.server.
Fixes an import failure I was getting under hgtk and hgweb:
*** failed to import extension inotify: 'module' object has no attribute 'inotify'
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 19 Aug 2008 15:36:03 -0700 |
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