-
Committer:
Aaron Bentley
-
Date:
2006-04-05 20:37:37 UTC
-
mto:
(2027.1.2 revert-subpath-56549)
-
mto:
This revision was merged to the branch mainline in
revision
1647.
-
Revision ID:
abentley@panoramicfeedback.com-20060405203737-d50848ef2df7344a
Eliminated conflicts_to_strings, made remove_files a ConflictList member