diff options
| author |  Alex Riesen <raa.lkml@gmail.com> | 2009-05-11 11:31:42 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-07-29 10:26:10 -0700 |
| commit | 1c9b2d3aa12ea4e34c1d04cc2af4e07a1eecb964 (patch) | |
| tree | 68cd07352fb9ca73fa3f8338331324b6125ee131 /builtin-annotate.c | |
| parent | Start 1.6.5 cycle (diff) | |
| download | tgif-1c9b2d3aa12ea4e34c1d04cc2af4e07a1eecb964.tar.xz | |
Add a reminder test case for a merge with F/D transition
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>
Diffstat (limited to 'builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions