Merge pull request #4088 from chescock/packfile-name-using-complete-hash

author Edward Thomson <ethomson@edwardthomson.com>

Sun, 11 Jun 2017 09:37:46 +0000 (10:37 +0100)

committer GitHub <noreply@github.com>

Sun, 11 Jun 2017 09:37:46 +0000 (10:37 +0100)
author Edward Thomson <ethomson@edwardthomson.com>
Sun, 11 Jun 2017 09:37:46 +0000 (10:37 +0100)
committer GitHub <noreply@github.com>
Sun, 11 Jun 2017 09:37:46 +0000 (10:37 +0100)
diff --cc src/indexer.c
Simple merge
diff --cc tests/pack/packbuilder.c
Simple merge
author	Edward Thomson <ethomson@edwardthomson.com>
	Sun, 11 Jun 2017 09:37:46 +0000 (10:37 +0100)
committer	GitHub <noreply@github.com>
	Sun, 11 Jun 2017 09:37:46 +0000 (10:37 +0100)
		1	2
src/indexer.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/pack/packbuilder.c	patch \|	diff1 \|	diff2 \|	blob \| history