From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 28 Apr 2013 18:53:57 +0000 (-0700)
Subject: Merge branch 'jk/merge-tree-added-identically'
X-Git-Tag: v1.8.3-rc1~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c?hp=ea573521828162b998389fbfc45d47f413b016fe

Merge branch 'jk/merge-tree-added-identically'

off-by-one fix.

* jk/merge-tree-added-identically:
merge-tree: fix typo in "both changed identically"
---

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index ed25d81b88..ec49917a36 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -302,7 +302,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
 static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *info)
 {
 	/* Same in both? */
-	if (same_entry(entry+1, entry+2) || both_empty(entry+0, entry+2)) {
+	if (same_entry(entry+1, entry+2) || both_empty(entry+1, entry+2)) {
 		/* Modified, added or removed identically */
 		resolve(info, NULL, entry+1);
 		return mask;
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index bd43b3d8ef..2defb422e8 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