| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add a reminder test case for a merge with F/D transition | Alex Riesen | 2009-07-29 | 1 | -0/+23 |
| | | | | | | | | | | | | | | The problem is that if a file was replaced with a directory containing another file with the same content and mode, an attempt to merge it with a branch descended from a commit before this F->D transition will cause merge-recursive to break. It breaks even if there were no conflicting changes on that other branch. Originally reported by Anders Melchiorsen. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | ||||
| * | New test case: merge with directory/file conflicts | Fredrik Kuivinen | 2005-12-03 | 1 | -0/+25 |
| Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | |||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |