-
Committer:
Aaron Bentley
-
Date:
2007-06-25 20:25:38 UTC
-
mto:
(2520.5.2 bzr.mpbundle)
-
mto:
This revision was merged to the branch mainline in
revision
2631.
-
Revision ID:
abentley@panoramicfeedback.com-20070625202538-j0k4t5akruv04e79
Fix lock handling in merge directives