-
Committer:
Canonical.com Patch Queue Manager
-
Date:
2009-01-23 10:31:45 UTC
-
mfrom:
(3954.1.2 bzr.integration)
-
Revision ID:
pqm@pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
(jam, vila) Fix an edge case with deleted files and criss-cross merges