diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:29:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:29:37 -0700 |
| commit | 97e5f4908dd22c99e825ccb254f05a61fda8d19c (patch) | |
| tree | 72d9d7d5d33393551b0d68df71b254863be5e42f /t/t7605-merge-resolve.sh | |
| parent | ab54cd6c4d54b7d9bf6dccfa7ea54f209ea76601 (diff) | |
| parent | 446247db78a733f44d2470afb1f1983d28058159 (diff) | |
| download | git-97e5f4908dd22c99e825ccb254f05a61fda8d19c.tar.gz | |
Merge branch 'mv/maint-merge-fix' into maint
* mv/maint-merge-fix:
merge: fix numerus bugs around "trivial merge" area
Diffstat (limited to 't/t7605-merge-resolve.sh')
| -rwxr-xr-x | t/t7605-merge-resolve.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh index ee21a107fd..f1f86ddb23 100755 --- a/t/t7605-merge-resolve.sh +++ b/t/t7605-merge-resolve.sh @@ -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)' ' |