path: root/t/
AgeCommit message (Collapse)Author
2007-06-07War on whitespaceJunio C Hamano
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 <>
2007-04-20Remove case-sensitive file in t3030-merge-recursive.Brian Gernhardt
Rename "A" to the unused "c" Signed-off-by: Brian Gernhardt <> Signed-off-by: Junio C Hamano <>
2007-04-10t3030: merge-recursive backend test.Junio C Hamano
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 <>