Show More
| @@ -1,5 +1,9 b'' | |||||
| 1 | #!/bin/sh |
|
1 | #!/bin/sh | |
| 2 |
|
2 | |||
|
|
3 | # N.B. bzr 1.13 has a bug that breaks this test. If you see this | |||
|
|
4 | # test fail, check your bzr version. Upgrading to bzr 1.13.1 | |||
|
|
5 | # should fix it. | |||
|
|
6 | ||||
| 3 | . "$TESTDIR/bzr-definitions" |
|
7 | . "$TESTDIR/bzr-definitions" | |
| 4 |
|
8 | |||
| 5 | echo % test multiple merges at once |
|
9 | echo % test multiple merges at once | |
General Comments 0
You need to be logged in to leave comments.
Login now