Viewing all changes in revision 5535.2.4.
- Committer: Andrew Bennetts
- Date: 2010-11-11 23:48:07 UTC
- mfrom: (5537 +trunk)
- mto: This revision was merged to the branch mainline in revision 5538.
- Revision ID: andrew.bennetts@canonical.com-20101111234807-fg7cjilh8gi3vud4
Merge lp:bzr.
- files added:
- bzrlib/tests/blackbox/test_resolve.py
- files modified:
- bzrlib/commit.py
expand all
collapse all
added
removed
