| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-09-29 | merge-recursive: Make room for directories in D/F conflicts |  Elijah Newren | 1 | -1/+1 |
| 2010-09-29 | handle_delete_modify(): Check whether D/F conflicts are still present | Elijah Newren | 1 | -1/+1 |
| 2010-09-29 | t6020: Add a testcase for modify/delete + directory/file conflict | Elijah Newren | 1 | -0/+47 |
| 2010-09-29 | t6020: Modernize style a bit | Elijah Newren | 1 | -15/+20 |
| 2010-07-09 | merge_recursive: Fix renames across paths below D/F conflicts | Elijah Newren | 1 | -1/+1 |
| 2009-07-29 | Add a reminder test case for a merge with F/D transition |  Alex Riesen | 1 | -0/+23 |
| 2005-12-03 | New test case: merge with directory/file conflicts |  Fredrik Kuivinen | 1 | -0/+25 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |