-
Committer:
Aaron Bentley
-
Date:
2007-11-23 20:19:57 UTC
-
mto:
This revision was merged to the branch mainline in
revision
3021.
-
Revision ID:
abentley@panoramicfeedback.com-20071123201957-xntyi59nfugfz2u1
Revert now resolves conflicts recursively (#102739)