annotate hgext/__init__.py @ 2552:bb403d427974

Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:28:31 +0200
parents 7d439981bec4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1360
7d439981bec4 Re-add hgext/__init__.py
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 # placeholder