No subject

*   ok 24: deepening fetch in shallow repo

* expecting success: test "count: 18" = "count: 18"
*   ok 25: clone shallow object count

* expecting failure: (cd shallow; git pull --depth 4 .. A)
remote: Total 0 (delta 0), reused 0 (delta 0)
Merging HEAD with 121a4babded3118a7dba09fbe742ea3613ca2ebc
Merging:
3cdd46c B69 c5c13e24714774f01dbbaa1e7eef7ea94a91c9ec
121a4ba A11 af28e88615bb279041ce67f4ba5ea0c49321f9d8
found 0 common ancestor(s):
Auto-merged test.txt
CONFLICT (add/add): Merge conflict in test.txt
Automatic merge failed; fix conflicts and then commit the result.
*   ok 26: pull in shallow repo with missing merge base

* passed all 26 test(s)
*** t5502-quickfetch.sh ***
* expecting success: 

	test_tick &&
	echo ichi >file &&
	git add file &&
	git commit -m initial &&

	cnt=$( (
		git count-objects | sed -e "s/ *objects,.*//"
	) ) &&
	test $cnt -eq 3

Created initial commit f3b89bf: initial
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 file
*   ok 1: setup

* expecting success: 

	(
		mkdir cloned &&
		cd cloned &&
		git init-db &&
		git remote add -f origin ..
	) &&
	cnt=$( (
		cd cloned &&
		git count-objects | sed -e "s/ *objects,.*//"
	) ) &&
	test $cnt -eq 3

Initialized empty Git repository in .git/
warning: no common commits
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 0 (delta 0)