/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_resolve.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
84
84
$ cd a
85
85
$ brz commit -m one
86
86
$ cd ..
87
 
$ brz clone a b
 
87
$ brz branch a b
88
88
$ echo bar > b/dir/file
89
89
$ cd a
90
90
$ rm -r dir