« back to all changes in this revision
Viewing changes to NEWS
- Committer: Aaron Bentley
- Date: 2006-12-05 22:15:51 UTC
- mto: (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
- mto: This revision was merged to the branch mainline in revision 2164.
- Revision ID: abentley@panoramicfeedback.com-20061205221551-uopn4nd9prt1ei2s
Add --text parameter to conflicts
- files modified:
- NEWS
added
removed
NEWS
