-* merge-recursive needs to register conflicting paths as higher
- stage entries in the index. For that, it first needs to
- construct three trees whose paths are already renamed, and
- call 3-way read-tree. Alternatively, update-index needs to
- give it a way to construct higher stages [DONE using the
- "alternatively" implementation].
-
-* daemon --strict-symlink [can be post 1.0].
-
-* Binary package split. Plan laid out and discussion mostly
- done. [RPM side done; Debian side thrown over the wall.]