remote-bzr: use branch variable when appropriate

diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index bd43b3d8ef8b3e71f6985cfa96a940dccb4a0a54..2defb422e8813c1ca314939aedba1d33c40dd388 100755 (executable)
--- a/t/t4300-merge-tree.sh
+++ b/t/t4300-merge-tree.sh
@@ -205,6 +205,19 @@ EXPECTED
        test_cmp expected actual
 '
 
+test_expect_success 'file remove A, B (same)' '
+       cat >expected <<\EXPECTED &&
+EXPECTED
+
+       git reset --hard initial &&
+       test_commit "rm-a-b-base" "ONE" "AAA" &&
+       git rm ONE &&
+       git commit -m "rm-a-b" &&
+       git tag "rm-a-b" &&
+       git merge-tree rm-a-b-base rm-a-b rm-a-b >actual &&
+       test_cmp expected actual
+'
+
 test_expect_success 'file change A, remove B' '
        cat >expected <<\EXPECTED &&
 removed in remote