aboutsummaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
Commit message (Collapse)AuthorAge
* Add a reminder test case for a merge with F/D transitionAlex Riesen2009-07-29
| | | | | | | | | | | | | 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 conflictsFredrik Kuivinen2005-12-03
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>