diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-14 01:46:46 -0700 |
|---|---|---|
| committer | Petr Baudis <xpasky@machine.sinus.cz> | 2005-05-15 01:44:30 +0200 |
| commit | 2ecd90502f4615c4f1a9340dfaed3f78ecd23747 (patch) | |
| tree | cc5537bee7d7593bcb6c81bbe3e8c5311acc2660 /diff.c | |
| parent | 1bb4624417dc7a9a73454fae471e6d2b195ae84d (diff) | |
| download | git-2ecd90502f4615c4f1a9340dfaed3f78ecd23747.tar.gz git-2ecd90502f4615c4f1a9340dfaed3f78ecd23747.tar.xz | |
[PATCH] Add the merge test Linus called "test script from hell".
This is an adaptation to the test framework of a historic test
that was used before three way merge form of read-tree was
introduced, and subsequently used to validate the read-tree -m
merge works correctly. It covers all the tricky cases known
back then and also have been updated to cover conflicting
files/directories cases since then.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions