Merge pull request #2972 from libgit2/cmn/pack-objects-walk

author Edward Thomson <ethomson@edwardthomson.com>

Tue, 17 Mar 2015 14:06:50 +0000 (10:06 -0400)

committer Edward Thomson <ethomson@edwardthomson.com>

Tue, 17 Mar 2015 14:06:50 +0000 (10:06 -0400)
author Edward Thomson <ethomson@edwardthomson.com>
Tue, 17 Mar 2015 14:06:50 +0000 (10:06 -0400)
committer Edward Thomson <ethomson@edwardthomson.com>
Tue, 17 Mar 2015 14:06:50 +0000 (10:06 -0400)
diff --cc src/indexer.c
Simple merge
diff --cc src/transports/local.c
Simple merge
author	Edward Thomson <ethomson@edwardthomson.com>
	Tue, 17 Mar 2015 14:06:50 +0000 (10:06 -0400)
committer	Edward Thomson <ethomson@edwardthomson.com>
	Tue, 17 Mar 2015 14:06:50 +0000 (10:06 -0400)
		1	2
src/indexer.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/transports/local.c	patch \|	diff1 \|	diff2 \|	blob \| history