diff options
| author | Stefan Beller <stefanbeller@gmail.com> | 2014-09-21 22:38:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-22 12:46:15 -0700 |
| commit | 8c3419bdbd5b49892c28ef32af80e0d570e5d7a5 (patch) | |
| tree | c237bcf6bf133505f2247a7f6ff4ea4f95a3bfe7 /t/t6031-merge-recursive.sh | |
| parent | e6aaa393478bf3ee9f4cde8d82cd258c034cd335 (diff) | |
| download | git-8c3419bdbd5b49892c28ef32af80e0d570e5d7a5.tar.gz | |
t6031-test-merge-recursive: do not forget to add file to be committedsb/t6031-typofix
Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6031-merge-recursive.sh')
| -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 1cd649e245..c8bd6da0cb 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -14,6 +14,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 && |