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