Viewing all changes in revision 3144.6.1.
- Committer: Aaron Bentley
- Date: 2008-03-11 14:29:08 UTC
- mto: This revision was merged to the branch mainline in revision 3264.
- Revision ID: aaron@aaronbentley.com-20080311142908-yyrvcpn2mldt0fnn
Update documentation to reflect conflict-handling difference
- files modified:
- doc/developers/lca-merge.txt
expand all
collapse all
added
removed
