diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:27:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:28:16 -0800 |
| commit | 03f94ae9f909952ed5a78917ab319a312889354b (patch) | |
| tree | 0fd041e8b390bd0d2a960ae629d8e965d363de92 /t/t7605-merge-resolve.sh | |
| parent | 2c47789d817aaf745a5ce5d5f79619c634cc8566 (diff) | |
| parent | 81b50f3ce40bfdd66e5d967bf82be001039a9a98 (diff) | |
| download | git-jk/maint-strbuf-missing-init.tar.gz | |
Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init
Diffstat (limited to 't/t7605-merge-resolve.sh')
| -rwxr-xr-x | t/t7605-merge-resolve.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh index ee21a107fd..0cb9d11f21 100755 --- a/t/t7605-merge-resolve.sh +++ b/t/t7605-merge-resolve.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='git-merge +test_description='git merge Testing the resolve strategy.' @@ -36,7 +36,9 @@ test_expect_success 'merge c1 to c2' ' git diff --exit-code && test -f c0.c && test -f c1.c && - test -f c2.c + test -f c2.c && + test 3 = $(git ls-tree -r HEAD | wc -l) && + test 3 = $(git ls-files | wc -l) ' test_expect_success 'merge c2 to c3 (fails)' ' |