Skip to content

Commit

Permalink
t3030: merge-recursive backend test.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Apr 10, 2007
1 parent 4d50895 commit 885b981
Showing 1 changed file with 528 additions and 0 deletions.
Loading

0 comments on commit 885b981

Please sign in to comment.