Tree: 60b188a984

Commit Graph

3 Commits (60b188a9844cdcf865174c685a38acc053a9d43b)

Author	SHA1	Message	Date
Junio C Hamano	a6080a0a44	War on whitespace ... This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>	18 years ago
Brian Gernhardt	744747ef1d	Remove case-sensitive file in t3030-merge-recursive. ... Rename "A" to the unused "c" Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Junio C Hamano	885b981075	t3030: merge-recursive backend test. ... We have fairly extensive coverage of read-tree 3-way machinery, and many Porcelain-ish tests use git-merge front-end tests, but we did not have good basic test for merge-recursive, which made it very hard to hack on it. I used this during the recent work to teach D/F conflicts to merge-recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago