Skip to content

Commit 8c3419b

Browse files
stefanbellergitster
authored andcommitted
t6031-test-merge-recursive: do not forget to add file to be committed
Signed-off-by: Stefan Beller <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e6aaa39 commit 8c3419b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

t/t6031-merge-recursive.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ test_expect_success 'mode change in one branch: keep changed version' '
1414
git commit -m a &&
1515
git checkout -b b1 master &&
1616
test_chmod +x file1 &&
17+
git add file1 &&
1718
git commit -m b1 &&
1819
git checkout a1 &&
1920
git merge-recursive master -- a1 b1 &&

0 commit comments

Comments
 (0)