annotate mercurial/__init__.py @ 85:58a1a0425c9b

Fix merge bug, I hope
author mpm@selenic.com
date Tue, 17 May 2005 11:40:45 -0800
parents 9117c6561b0b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source