-
Committer:
Robert Collins
-
Date:
2010-01-28 17:27:16 UTC
-
mto:
(4797.2.5 2.1)
-
mto:
This revision was merged to the branch mainline in
revision
4989.
-
Revision ID:
robertc@robertcollins.net-20100128172716-i6s7itz6flgxl66i
Support state on per-file merging to permit more efficient use of configuration data.