From: Junio C Hamano <junkio@cox.net>
Date: Sat, 7 Apr 2007 14:17:35 +0000 (-0700)
Subject: t3030: merge-recursive backend test.
X-Git-Tag: v1.5.2-rc0~39^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/885b98107547fe3f6d17ca0af0578e040f7600d0?ds=sidebyside;hp=885b98107547fe3f6d17ca0af0578e040f7600d0

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>
---