Mercurial > hg

view tests/test-merge4.out @ 6994:bf727bab38b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)