diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-25 02:24:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 16:52:16 -0700 |
| commit | 1abb3f14c872ac1b5b70db4334b21dde60e57b7a (patch) | |
| tree | 5b4d981d3bc2007527990f4d71972c9231c2c509 /git-merge-one-file-script | |
| parent | 59e6b23acef9d29b9bdabc38ee80361e19ef7ebe (diff) | |
| download | git-1abb3f14c872ac1b5b70db4334b21dde60e57b7a.tar.gz | |
[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>
Diffstat (limited to 'git-merge-one-file-script')
0 files changed, 0 insertions, 0 deletions