Viewing all changes in revision 2063.
- Committer: Canonical.com Patch Queue Manager
- Date: 2006-10-05 04:18:29 UTC
- mfrom: (1551.8.40 Aaron's mergeable stuff)
- Revision ID: pqm@pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
Fix diff3 merges to not indicate conflicts on clean merges
- files modified:
- NEWS
expand all
collapse all
added
removed
