Merge pull request #3226 from libgit2/cmn/racy-diff-again

author Edward Thomson <ethomson@edwardthomson.com>

Wed, 24 Jun 2015 03:30:58 +0000 (23:30 -0400)

committer Edward Thomson <ethomson@edwardthomson.com>

Wed, 24 Jun 2015 03:30:58 +0000 (23:30 -0400)
author Edward Thomson <ethomson@edwardthomson.com>
Wed, 24 Jun 2015 03:30:58 +0000 (23:30 -0400)
committer Edward Thomson <ethomson@edwardthomson.com>
Wed, 24 Jun 2015 03:30:58 +0000 (23:30 -0400)
diff --cc CHANGELOG.md
Simple merge
diff --cc tests/diff/workdir.c
Simple merge
author	Edward Thomson <ethomson@edwardthomson.com>
	Wed, 24 Jun 2015 03:30:58 +0000 (23:30 -0400)
committer	Edward Thomson <ethomson@edwardthomson.com>
	Wed, 24 Jun 2015 03:30:58 +0000 (23:30 -0400)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
tests/diff/workdir.c	patch \|	diff1 \|	diff2 \|	blob \| history