diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-07 07:17:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-10 12:55:51 -0700 |
| commit | 885b98107547fe3f6d17ca0af0578e040f7600d0 (patch) | |
| tree | 7ccb54fc90224c34678eff6ad65f7c78eab56e7e /diff.h | |
| parent | merge-recursive: handle D/F conflict case more carefully. (diff) | |
| download | tgif-885b98107547fe3f6d17ca0af0578e040f7600d0.tar.xz | |
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>
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions