Revision b825e6ff5d003db8efd1ed43cdbbb9d637df0a0c authored by Junio C Hamano on 11 December 2005, 20:44:46 UTC, committed by Junio C Hamano on 11 December 2005, 20:44:46 UTC
This adds a couple of tests to cover the following renaming merge cases: - one side renames and the other side does not, with and without content conflicts. - both side rename to the same path, with and without content conflicts. The test setup also prepares a case in which both side rename to different destination, but currently the code collapses these destination paths and removes the original path, which may be wrong. The outcome of this case is not checked by the tests in this round. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 157dc07
| File | Mode | Size |
|---|---|---|
| .gitignore | -rw-r--r-- | 58 bytes |
| changelog | -rw-r--r-- | 3.0 KB |
| compat | -rw-r--r-- | 2 bytes |
| control | -rw-r--r-- | 2.5 KB |
| copyright | -rw-r--r-- | 978 bytes |
| docs | -rw-r--r-- | 7 bytes |
| git-arch.files | -rw-r--r-- | 46 bytes |
| git-core.doc-base | -rw-r--r-- | 301 bytes |
| git-core.files | -rw-r--r-- | 5 bytes |
| git-cvs.files | -rw-r--r-- | 44 bytes |
| git-doc.files | -rw-r--r-- | 126 bytes |
| git-email.files | -rw-r--r-- | 58 bytes |
| git-svn.files | -rw-r--r-- | 44 bytes |
| git-tk.files | -rw-r--r-- | 41 bytes |
| rules | -rwxr-xr-x | 2.2 KB |
Computing file changes ...
