| changeset 8084 | 5b3fee9c1f4d |
| parent 7604 | 7c4765d51c3c |
| 8083:29ac24a36ed7 | 8084:5b3fee9c1f4d |
|---|---|
1 #!/bin/sh |
1 #!/bin/sh |
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. |
|
2 |
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 |
6 mkdir test-multimerge |
10 mkdir test-multimerge |