git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Tue, 27 Jan 2009 09:08:02 +0000 (01:08 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 27 Jan 2009 09:08:02 +0000 (01:08 -0800)
commit	90b23e5f21e101f14da60375e4bda265a677e209
tree	effeccd13890741e6f0d5bafabd65be2c0d92551	tree \| snapshot
parent	5c415311f743ccb11a50f350ff1c385778f049d6	commit \| diff
parent	b67b9612e1a90ae093445abeaeff930e9f4cf936	commit \| diff

Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-metainfo

This is an evil merge, as a test added since 1.6.0 expects an incorrect
behaviour the merged commit fixes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff.c	diff1 \|	diff2 \|	blob \| history
t/t4030-diff-textconv.sh	diff1 \|	\|	blob \| history

Git—the stupid content tracker

RSS Atom

diff.c	diff1 \|	diff2 \|	blob \| history
t/t4030-diff-textconv.sh	diff1 \|	\|	blob \| history