-
Committer:
Aaron Bentley
-
Date:
2006-03-10 15:25:59 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-20060310152559-1a02f3c368f5b792
Implemented conflict_lines in terms of old system on WorkingTree