-
Committer:
Canonical.com Patch Queue Manager
-
Date:
2008-01-03 23:18:14 UTC
-
mfrom:
(3146.5.4 test-merge-uncommitted)
-
Revision ID:
pqm@pqm.ubuntu.com-20080103231814-wymg8td870lqfzkv
Make merge --uncommitted work with merge-type weave/lca (abentley)