projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4d50895) | patch
t3030: merge-recursive backend test.
authorJunio C Hamano <junkio@cox.net>
Sat, 7 Apr 2007 14:17:35 +0000 (07:17 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 10 Apr 2007 19:55:51 +0000 (12:55 -0700)
commit885b98107547fe3f6d17ca0af0578e040f7600d0
tree7ccb54fc90224c34678eff6ad65f7c78eab56e7etree | snapshot
parent4d50895a390658bf1b9a9385dbc0b9f90b48c803commit | diff
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>
t/t3030-merge-recursive.sh [new file with mode: 0755] blob
Git—the stupid content tracker