kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
9,953 Commits
6 Branches
975 Tags
211 MiB
Commit Graph

2 Commits (51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9)

Author SHA1 Message Date
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>
 2007-04-19 23:28:15 -07:00
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>
 2007-04-10 12:55:51 -07:00