diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:14 -0700 |
| commit | 12ba0e771cb1af16d0ac074a6a9656cbf45494cc (patch) | |
| tree | 7b7062c329871bf8298251c45a74dada7b8635d9 | |
| parent | 4d4dc66df0da8b6c1ee7af4299ed9bcaa796f787 (diff) | |
| parent | 8c3419bdbd5b49892c28ef32af80e0d570e5d7a5 (diff) | |
| download | git-12ba0e771cb1af16d0ac074a6a9656cbf45494cc.tar.gz | |
Merge branch 'sb/t6031-typofix'
* sb/t6031-typofix:
t6031-test-merge-recursive: do not forget to add file to be committed
| -rwxr-xr-x | t/t6031-merge-recursive.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index a953f1b55c..6464a16a19 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -13,6 +13,7 @@ test_expect_success 'mode change in one branch: keep changed version' ' git commit -m a && git checkout -b b1 master && test_chmod +x file1 && + git add file1 && git commit -m b1 && git checkout a1 && git merge-recursive master -- a1 b1 && |