Viewing all changes in revision 4797.47.1.
- Committer: Andrew Bennetts
- Date: 2010-04-29 05:14:04 UTC
- mto: (4797.43.6 2.1)
- mto: This revision was merged to the branch mainline in revision 5199.
- Revision ID: andrew.bennetts@canonical.com-20100429051404-of51oixupsmpp2li
Backport lp:bzr r5186: (abentley) Fix switch with per-file mergers (#559436)
- files modified:
- NEWS
expand all
collapse all
added
removed
