Re: [PATCH] merge-tree: fix typo in "both changed identically"

From

René Scharfe <rene.scharfe@lsrfire.ath.cx>

Date

Apr 27, 2013, 13:23 UTC

Message-ID

<517BD146.1040401@lsrfire.ath.cx>

In-Reply-To

<51cbc79a9b250544a8365980d078601dfcd2b782.1367067799.git.john@keeping.me.uk>

How about squashing in this test?

René

---
 t/t4300-merge-tree.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index bd43b3d..2defb42 100755
--- 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

-- 
1.8.2.1