Viewing all changes in revision 1711.2.109.
- Committer: John Arbash Meinel
- Date: 2006-07-31 14:31:56 UTC
- mto: (1946.2.6 reduce-knit-churn)
- mto: This revision was merged to the branch mainline in revision 1905.
- Revision ID: john@arbash-meinel.com-20060731143156-1508e14154ce48d8
Add a test for handling a pending merge plus an update.
- files modified:
- bzrlib/tests/blackbox/test_update.py
expand all
collapse all
added
removed
