Age | Commit message (Expand) | Author |
---|---|---|
2010-07-10 | merge_recursive: Fix renames across paths below D/F conflicts | Elijah Newren |
2009-07-29 | Add a reminder test case for a merge with F/D transition | Alex Riesen |
2005-12-03 | New test case: merge with directory/file conflicts | Fredrik Kuivinen |