- 
Committer:
Robert Collins
- 
Date:
2006-06-16 15:25:15 UTC
- 
mto:
(1777.1.2 integration)
- 
mto:
This revision was merged to the branch mainline in
revision
1779.
- 
Revision ID:
robertc@robertcollins.net-20060616152515-961fbde13f8a3527
Teach all trees about unknowns, conflicts and get_parent_ids.