Viewing all changes in revision 2977.1.2.
- Committer: Ian Clatworthy
- Date: 2007-11-21 02:54:47 UTC
- mto: (3054.1.1 ianc-integration)
- mto: This revision was merged to the branch mainline in revision 3055.
- Revision ID: ian.clatworthy@internode.on.net-20071121025447-nhk6gpbi273neulr
add conflict handling as an Appendix + minor tweaks
expand all
collapse all
added
removed
