Viewing all changes in revision 4037.2.5.
- Committer: Roberto Aguilar
- Date: 2009-02-27 08:37:19 UTC
- mto: (4090.1.1 bzr.ab.integration)
- mto: This revision was merged to the branch mainline in revision 4092.
- Revision ID: roberto.c.aguilar@gmail.com-20090227083719-0etmu5762avd63f1
Updating tests for uncommitted changes.
Updating test_merge_remember() to pass when the uncommitted changes test
happens further up the chain and adding another file into the test branch to
make sure that implicit --remember continues to work.
Updating test_merge_remember() to pass when the uncommitted changes test
happens further up the chain and adding another file into the test branch to
make sure that implicit --remember continues to work.
- files modified:
- bzrlib/tests/blackbox/test_merge.py
expand all
collapse all
added
removed
