undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6036: fix broken && chain in sub-shell

Browse Source 
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ramsay Jones 2018-07-12 16:32:25 +01:00 committed by Junio C Hamano
parent 327ac9cb9d
commit 6b82db9b42
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6036-recursive-corner-cases.sh
View File

@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict
test_write_lines 1 2 3 4 5 6 7 8 >a &&
git add a &&
git commit -m E3 &&
git tag E3
git tag E3 &&
git checkout C^0 &&
test_must_fail git merge B^0 &&