diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-28 18:53:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-28 18:53:57 (GMT) |
| commit | 27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c (patch) | |
| tree | 23fc48e5923ec3c80c5de47310d11f39053cb796 /t | |
| parent | ea573521828162b998389fbfc45d47f413b016fe (diff) | |
| parent | ab5f42422d7e025c3151d91cc5ec0d20b9a80922 (diff) | |
| download | git-27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c.zip git-27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c.tar.gz git-27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c.tar.bz2 | |
Merge branch 'jk/merge-tree-added-identically'
off-by-one fix.
* jk/merge-tree-added-identically:
merge-tree: fix typo in "both changed identically"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4300-merge-tree.sh | 13 |
1 files changed, 13 insertions, 0 deletions
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 |