| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Standardize on --long-option instead of -long-option | Simon McVittie | 2015-03-01 |
| * | another class of conflicts: subdir/file conflicts | Joey Hess | 2010-07-18 |
| * | 2 more cases | Joey Hess | 2010-07-18 |
| * | avoid error if two source files render the same destination file | Joey Hess | 2010-07-18 |
| * | some other (similar) failure cases | Joey Hess | 2010-07-18 |
| * | update | Joey Hess | 2010-07-17 |
| * | turning into complete source file conflict test suite | Joey Hess | 2010-07-17 |