| commit | 2ecd90502f4615c4f1a9340dfaed3f78ecd23747 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 14 May 2005 08:46:46 +0000 (14 01:46 -0700) | ||
| committer | Petr Baudis <xpasky@machine.sinus.cz> | |
| Sat, 14 May 2005 23:44:30 +0000 (15 01:44 +0200) | ||
| tree | cc5537bee7d7593bcb6c81bbe3e8c5311acc2660 | treesnapshot (tar.gz zip) |
| parent | 1bb4624417dc7a9a73454fae471e6d2b195ae84d | commitdiff |
[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>
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>
| t/t1000-read-tree-m-3way.sh | [new file with mode: 0644] | blob |