Viewing all changes in revision 1614.2.5.
- Committer: Olaf Conradi
- Date: 2006-03-23 23:00:08 UTC
- mto: (1661.1.1 bzr.mbp.remember)
- mto: This revision was merged to the branch mainline in revision 1663.
- Revision ID: olaf@conradi.org-20060323230008-8553da6ea86bf149
Added testcase for bzr merge --remember.
Changed branch.set_parent() to accepts None to remove parent.
Changed branch.set_parent() to accepts None to remove parent.
- files added:
- bzrlib/tests/blackbox/test_merge.py
- files modified:
- bzrlib/branch.py
expand all
collapse all
added
removed
