![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 25 Jun 2005 09:24:16 +0000 (02:24 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sat, 25 Jun 2005 23:52:16 +0000 (16:52 -0700) | ||
| commit | 1abb3f14c872ac1b5b70db4334b21dde60e57b7a | |
| tree | 5b4d981d3bc2007527990f4d71972c9231c2c509 | tree | snapshot |
| parent | 59e6b23acef9d29b9bdabc38ee80361e19ef7ebe | commit | diff |
[PATCH] Add more tests for read-tree --emu23.
This adds more tests for --emu23. One is to show how it can
carry forward more local changes than the straightforward
two-way fast forward, and another is to show the recent
overeager optimization of directory/file conflict check broke
things, which will be fixed in the next commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This adds more tests for --emu23. One is to show how it can
carry forward more local changes than the straightforward
two-way fast forward, and another is to show the recent
overeager optimization of directory/file conflict check broke
things, which will be fixed in the next commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| t/t1001-read-tree-m-2way.sh | diff | blob | history | |
| t/t1005-read-tree-m-2way-emu23.sh | diff | blob | history |