Display conflicts to be resolved.

[Ollivier Robert]

According to Brendan Cully:
> You're right. It's in crew but hasn't propagated yet. In the mean
> time, it can be gotten here:

It is in tip since Aug, 6th (and possibly before):

296 [12:06] roberto at roberto-al:~> ll Build/UP/hg-current/hgext 
total 560
-rw-r--r--   1 roberto  roberto     14 Oct  1  2005 __init__.py
-rw-r--r--   1 roberto  roberto   4555 Jun  5 17:12 acl.py
-rw-r--r--   1 roberto  roberto   2247 Aug  6 11:56 alias.py
[...]
-rw-r--r--   1 roberto  roberto  10070 Aug  6 11:56 imerge.py

-- 
Ollivier ROBERT -=- FreeBSD: The Power to Serve! -=- roberto at keltia.freenix.fr
Darwin sidhe.keltia.net Version 8.10.1: Wed May 23 16:33:00 PDT 2007 i386