annotate mercurial/__init__.py @ 6213:5c5e45766224

imerge: Fix unbound name error and add a test case
author Joel Rosdahl <joel@rosdahl.net>
date Thu, 06 Mar 2008 22:23:41 +0100
parents 9117c6561b0b
children 4374d819ccd5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source