Merge branch 'ob/typofixes'

author Junio C Hamano <gitster@pobox.com>

Thu, 25 Jul 2013 02:23:00 +0000 (19:23 -0700)

committer Junio C Hamano <gitster@pobox.com>

Thu, 25 Jul 2013 02:23:01 +0000 (19:23 -0700)
author Junio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2013 02:23:00 +0000 (19:23 -0700)
committer Junio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2013 02:23:01 +0000 (19:23 -0700)
diff --cc diff.c
Simple merge
diff --cc sha1_name.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Thu, 25 Jul 2013 02:23:00 +0000 (19:23 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 25 Jul 2013 02:23:01 +0000 (19:23 -0700)
		1	2
diff.c	patch \|	diff1 \|	diff2 \|	blob \| history
sha1_name.c	patch \|	diff1 \|	diff2 \|	blob \| history